From aff288424f58905da60931ad86a50a03c7552af3 Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 20 Apr 2023 22:57:03 +0200 Subject: [PATCH 01/69] nixos/mastodon: fixup sidekiq jobClasses assertion See https://github.com/NixOS/nixpkgs/pull/225005#issuecomment-1516677321 --- nixos/modules/services/web-apps/mastodon.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/web-apps/mastodon.nix b/nixos/modules/services/web-apps/mastodon.nix index cf5329be489c..247eb707b15c 100644 --- a/nixos/modules/services/web-apps/mastodon.nix +++ b/nixos/modules/services/web-apps/mastodon.nix @@ -588,11 +588,12 @@ in { ''; } { - assertion = 1 == builtins.length - (lib.mapAttrsToList - (_: v: builtins.elem "scheduler" v.jobClasses || v.jobClasses == [ ]) - cfg.sidekiqProcesses); - message = "There must be one and only one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\"."; + assertion = 1 == + (lib.count (x: x) + (lib.mapAttrsToList + (_: v: builtins.elem "scheduler" v.jobClasses || v.jobClasses == [ ]) + cfg.sidekiqProcesses)); + message = "There must be exactly one Sidekiq queue in services.mastodon.sidekiqProcesses with jobClass \"scheduler\"."; } ]; From bd3a5d095cc80e1bf03c2c6d7b00e51c1e5933eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 06:33:29 +0000 Subject: [PATCH 02/69] stress-ng: 0.15.06 -> 0.15.07 --- pkgs/tools/system/stress-ng/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/stress-ng/default.nix b/pkgs/tools/system/stress-ng/default.nix index f595c40079d5..0cfed40f230d 100644 --- a/pkgs/tools/system/stress-ng/default.nix +++ b/pkgs/tools/system/stress-ng/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.15.06"; + version = "0.15.07"; src = fetchFromGitHub { owner = "ColinIanKing"; repo = pname; rev = "V${version}"; - hash = "sha256-64PEeVpbFs0BjH4DvATlwErxqeJl/vn5otfiylT1RNk="; + hash = "sha256-mNV0izRm6vVmmkpI9z1lswWtyTKIc2CXIBDNyC4XDPc="; }; postPatch = '' From 474775b07b0d142830b4004369cd41846c95799e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 06:57:32 +0000 Subject: [PATCH 03/69] python310Packages.cloudsmith-api: 2.0.1 -> 2.0.2 --- 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 285e90c22526..7a708f328718 100644 --- a/pkgs/development/python-modules/cloudsmith-api/default.nix +++ b/pkgs/development/python-modules/cloudsmith-api/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "cloudsmith-api"; - version = "2.0.1"; + version = "2.0.2"; format = "wheel"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "cloudsmith_api"; inherit format version; - hash = "sha256-wFSHlUdZTARsAV3igVXThrXoGsPUaZyzXBJCSJFZYYQ="; + hash = "sha256-6y63xo3ftZPT7GX/oN8bHZIEJRdKnUFar3eThjyKN6w="; }; propagatedBuildInputs = [ From cb0cd0ac2fa7d7522adc67eeb7235d5ac3074f96 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 07:03:05 +0000 Subject: [PATCH 04/69] libmysqlconnectorcpp: 8.0.32 -> 8.0.33 --- pkgs/development/libraries/libmysqlconnectorcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix index 5429dd62c802..4adb3958bd32 100644 --- a/pkgs/development/libraries/libmysqlconnectorcpp/default.nix +++ b/pkgs/development/libraries/libmysqlconnectorcpp/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "libmysqlconnectorcpp"; - version = "8.0.32"; + version = "8.0.33"; src = fetchurl { url = "https://cdn.mysql.com/Downloads/Connector-C++/mysql-connector-c++-${version}-src.tar.gz"; - hash = "sha256-+9t/IUQnYy9CPoS6dZS+H5IF6sgSjGsYVyA7L1RVzvM="; + hash = "sha256-Fgz2iB+96b1GzRGq8Skwtna8bidYmsXHuknBlrl+BTs="; }; nativeBuildInputs = [ From ce61ac4ae42549cf031f104d1e9c7725e9b12b18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 11:39:06 +0000 Subject: [PATCH 05/69] python310Packages.ignite: 0.4.11 -> 0.4.12 --- pkgs/development/python-modules/ignite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ignite/default.nix b/pkgs/development/python-modules/ignite/default.nix index a47a97de6a20..054309a5258f 100644 --- a/pkgs/development/python-modules/ignite/default.nix +++ b/pkgs/development/python-modules/ignite/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "ignite"; - version = "0.4.11"; + version = "0.4.12"; src = fetchFromGitHub { owner = "pytorch"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-iuaBuKoKlt7F7Z7fbVOZAUAoFnU3AOxYC/ANgqoQksU="; + hash = "sha256-cLlPUPzYyOpqk4qHsn22s3Xr/VkGjnHL4JVw2qy2iTc="; }; nativeCheckInputs = [ pytestCheckHook matplotlib mock pytest-xdist torchvision ]; From c09965934936988a99cd4570f09aeb0ad77a2003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 13:53:12 +0000 Subject: [PATCH 06/69] python311Packages.croniter: 1.3.8 -> 1.3.14 --- pkgs/development/python-modules/croniter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/croniter/default.nix b/pkgs/development/python-modules/croniter/default.nix index fcd9247ae1e5..dbdccade27ac 100644 --- a/pkgs/development/python-modules/croniter/default.nix +++ b/pkgs/development/python-modules/croniter/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "croniter"; - version = "1.3.8"; + version = "1.3.14"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-MqXsBOl+wIN7zfATdnq9LnHM7u/TwuFMgECYzlGtbNk="; + hash = "sha256-0Gex+VtVPG6C2VqYPEZWlZE9zRL0eouaqTigRQ2U3V4="; }; propagatedBuildInputs = [ From 6ed3e360a4ea5bad857eb740dedfe7312e9a7899 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 11 May 2023 19:02:57 +0000 Subject: [PATCH 07/69] linkerd: 2.13.2 -> 2.13.3 --- pkgs/applications/networking/cluster/linkerd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/default.nix b/pkgs/applications/networking/cluster/linkerd/default.nix index ee6fc0a117ec..7dfbd7de0fce 100644 --- a/pkgs/applications/networking/cluster/linkerd/default.nix +++ b/pkgs/applications/networking/cluster/linkerd/default.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "stable"; - version = "2.13.2"; - sha256 = "0pcb4f8s8l156y0zd9g9f0pyydvp52n02krjy2giajp00gaqx3s3"; - vendorSha256 = "sha256-6KuXEKuQJvRNUM+6Uo+J9D3eHI+1tt62C5XZsEDwkTc="; + version = "2.13.3"; + sha256 = "080ay0qqb98m208rzj3jnv4jprcfg60b46dbv594i9ps6vhb4ndc"; + vendorSha256 = "sha256-5T3YrYr7xeRkAADeE24BPu4PYU4mHFspqAiBpS8n4Y0="; } From ed99fb0f5c2693787a54eb61e3906e7e309d6081 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 May 2023 07:44:01 +0000 Subject: [PATCH 08/69] python310Packages.ndindex: 1.6 -> 1.7 --- pkgs/development/python-modules/ndindex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ndindex/default.nix b/pkgs/development/python-modules/ndindex/default.nix index 6a749e4b8d30..de40dc3d71cf 100644 --- a/pkgs/development/python-modules/ndindex/default.nix +++ b/pkgs/development/python-modules/ndindex/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "ndindex"; - version = "1.6"; + version = "1.7"; format = "setuptools"; src = fetchFromGitHub { owner = "Quansight-Labs"; repo = "ndindex"; rev = "refs/tags/${version}"; - hash = "sha256-QLWGgbF5nNTa1SsSkupo+fAs9K7eTexTK9n9yDLVgrQ="; + hash = "sha256-JP0cEuxXfPTWc1EIUtMsy5Hx6eIo9vDzD0IUXm1lFME="; }; nativeBuildInputs = [ From 7efdfdce8072d89949c7f251d1892ea5089840ac Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 May 2023 03:41:11 +0000 Subject: [PATCH 09/69] sof-firmware: 2.2.4 -> 2.2.5 --- pkgs/os-specific/linux/firmware/sof-firmware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix index 9823e8c7ad59..60fa6dea9ecd 100644 --- a/pkgs/os-specific/linux/firmware/sof-firmware/default.nix +++ b/pkgs/os-specific/linux/firmware/sof-firmware/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "sof-firmware"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { url = "https://github.com/thesofproject/sof-bin/releases/download/v${version}/sof-bin-v${version}.tar.gz"; - sha256 = "sha256-zoquuhA6pWqCZiVSsPM/M6hZqhAI2L+8LCLwzPyMazo="; + sha256 = "sha256-V39FCHW9gzr5uLcW42jYc6rJE6Nd2ZbHqg9Srd3vku4="; }; dontFixup = true; # binaries must not be stripped or patchelfed From 67099b1d59d3baf4a9ae9e69772a987c3f9f2832 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 May 2023 01:44:32 +0000 Subject: [PATCH 10/69] miniflux: 2.0.43 -> 2.0.44 --- 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 5c55cd67b2b5..e2fc9d22a19b 100644 --- a/pkgs/servers/miniflux/default.nix +++ b/pkgs/servers/miniflux/default.nix @@ -2,7 +2,7 @@ let pname = "miniflux"; - version = "2.0.43"; + version = "2.0.44"; in buildGoModule { inherit pname version; @@ -11,10 +11,10 @@ in buildGoModule { owner = pname; repo = "v2"; rev = version; - sha256 = "sha256-IVIAlDYOuAl51V/Q1hpkjIREHTXq8E5D/w4cyTZ8ebs="; + sha256 = "sha256-PBhoKDljLpgi8cJicY7U7yrW3qNPDMzno/6PacOZ76E="; }; - vendorHash = "sha256-/BINHOlRmAfOIXY9x5VjnQwIc87Mt2TAvBE1tPq6W80="; + vendorHash = "sha256-Ydd1LiVq4cCyj7dvcwxpKNU1HjcvXbSerHYJNoV/YQY="; nativeBuildInputs = [ installShellFiles ]; From 5999c297dbfc9f08bd85e4773387580d65c06fe1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 May 2023 02:18:07 +0000 Subject: [PATCH 11/69] python310Packages.pyworld: 0.3.2 -> 0.3.3 --- pkgs/development/python-modules/pyworld/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyworld/default.nix b/pkgs/development/python-modules/pyworld/default.nix index 760a196001f7..7441ab1c9132 100644 --- a/pkgs/development/python-modules/pyworld/default.nix +++ b/pkgs/development/python-modules/pyworld/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyworld"; - version = "0.3.2"; + version = "0.3.3"; src = fetchPypi { inherit pname version; - hash = "sha256-Zo0JhCw8+nSx9u2r2wBYpkwE+c8XuTiD5tqBHhIErU0="; + hash = "sha256-o6gXVZg9+iKZqeKUd1JYLdzISlwnewT0WVzkQGNy0eU="; }; nativeBuildInputs = [ From b7edd2e76dc48dbb5e3907b8b7ad416c5770e466 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 May 2023 04:58:08 +0000 Subject: [PATCH 12/69] python310Packages.weconnect: 0.54.2 -> 0.55.0 --- pkgs/development/python-modules/weconnect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix index 385ea1ea4538..12b10e17446f 100644 --- a/pkgs/development/python-modules/weconnect/default.nix +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.54.2"; + version = "0.55.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "refs/tags/v${version}"; - hash = "sha256-Zjh4rWnpzzBZFQRZIoceeIn4DYn0/HqLLZFhc57yhLQ="; + hash = "sha256-+ISWPrpY/urpZZZrn6+Ii8gbrwkQMLL6gXhydXd8HqI="; }; propagatedBuildInputs = [ From 2472f4eaee09d97b874f1c0bbc8a0667c4e54a56 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Tue, 9 May 2023 08:58:26 +0800 Subject: [PATCH 13/69] flashrom: unbreak darwin --- pkgs/tools/misc/flashrom/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix index a76074918a66..3bd040512631 100644 --- a/pkgs/tools/misc/flashrom/default.nix +++ b/pkgs/tools/misc/flashrom/default.nix @@ -21,7 +21,8 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ libftdi1 libusb1 pciutils ] + buildInputs = [ libftdi1 libusb1 ] + ++ lib.optional (!stdenv.isDarwin) [ pciutils ] ++ lib.optional jlinkSupport libjaylink; postPatch = '' @@ -30,7 +31,8 @@ stdenv.mkDerivation rec { ''; makeFlags = [ "PREFIX=$(out)" "libinstall" ] - ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes"; + ++ lib.optional jlinkSupport "CONFIG_JLINK_SPI=yes" + ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=no" ]; postInstall = '' install -Dm644 util/flashrom_udev.rules $out/lib/udev/rules.d/flashrom.rules @@ -42,6 +44,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; maintainers = with maintainers; [ fpletz felixsinger ]; platforms = platforms.all; - broken = stdenv.isDarwin; # requires DirectHW }; } From 2015ab2d5cfde97f19e7abd7d3490376991b0d92 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Fri, 12 May 2023 10:07:41 +0800 Subject: [PATCH 14/69] flashrom-stable: unbreak darwin --- pkgs/tools/misc/flashrom-stable/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/flashrom-stable/default.nix b/pkgs/tools/misc/flashrom-stable/default.nix index 168b355475bc..b943c22d25be 100644 --- a/pkgs/tools/misc/flashrom-stable/default.nix +++ b/pkgs/tools/misc/flashrom-stable/default.nix @@ -27,13 +27,15 @@ stdenv.mkDerivation rec { buildInputs = [ libftdi1 - libgpiod libjaylink libusb1 + ] ++ lib.optionals (!stdenv.isDarwin) [ + libgpiod pciutils ]; - makeFlags = [ "PREFIX=$(out)" "libinstall" ]; + makeFlags = [ "PREFIX=$(out)" "libinstall" ] ++ lib.optionals stdenv.isDarwin [ "CONFIG_ENABLE_LIBPCI_PROGRAMMERS=no" ] + ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ "CONFIG_INTERNAL_X86=no" "CONFIG_INTERNAL_DMI=no" "CONFIG_RAYER_SPI=0" ]; meta = with lib; { homepage = "https://www.flashrom.org"; @@ -41,6 +43,5 @@ stdenv.mkDerivation rec { license = with licenses; [ gpl2 gpl2Plus ]; maintainers = with maintainers; [ felixsinger ]; platforms = platforms.all; - broken = stdenv.isDarwin; # requires DirectHW }; } From bc4e32887545e8cbbbffe99cf44271b9059d10cf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 May 2023 11:58:27 +0000 Subject: [PATCH 15/69] cloudlog: 2.4.1 -> 2.4.2 --- pkgs/applications/radio/cloudlog/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/cloudlog/default.nix b/pkgs/applications/radio/cloudlog/default.nix index 9f303dc7b518..4dd3838f6ac0 100644 --- a/pkgs/applications/radio/cloudlog/default.nix +++ b/pkgs/applications/radio/cloudlog/default.nix @@ -7,13 +7,13 @@ stdenvNoCC.mkDerivation rec { pname = "cloudlog"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "magicbug"; repo = "Cloudlog"; rev = version; - sha256 = "sha256-tFerQJhe/FemtOaP56b2XhLtXH2a8CRT2E69v/77Qz0="; + sha256 = "sha256-btfHHrb7m6ITWe/18u2pmZiZKpKebKMThqcXFIvO/P8="; }; postPath = '' From 5e27d26c055ee4a30bc4e7a8c232b828c7a60aaa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 May 2023 13:35:11 +0000 Subject: [PATCH 16/69] python310Packages.tensorflow-metadata: 1.13.0 -> 1.13.1 --- .../python-modules/tensorflow-metadata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tensorflow-metadata/default.nix b/pkgs/development/python-modules/tensorflow-metadata/default.nix index f1e94b5eb93c..49c2124c7952 100644 --- a/pkgs/development/python-modules/tensorflow-metadata/default.nix +++ b/pkgs/development/python-modules/tensorflow-metadata/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "tensorflow-metadata"; - version = "1.13.0"; + version = "1.13.1"; src = fetchFromGitHub { owner = "tensorflow"; repo = "metadata"; rev = "refs/tags/v${version}"; - hash = "sha256-XzOV0gTZo9Flr3HVI5mzK+qgol4rsteerfrgLpw4Ouo="; + hash = "sha256-G7OEupjKDbblp96u2oHVdSueGG5NON5gvYhuvyz4f3E="; }; patches = [ From 61748c7d97c41edd1bed867a5daf95b22291215c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 04:08:58 +0000 Subject: [PATCH 17/69] cloudmonkey: 6.2.0 -> 6.3.0 --- pkgs/tools/virtualization/cloudmonkey/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/virtualization/cloudmonkey/default.nix b/pkgs/tools/virtualization/cloudmonkey/default.nix index 5b857ab1c1ad..b7a9ec918cb9 100644 --- a/pkgs/tools/virtualization/cloudmonkey/default.nix +++ b/pkgs/tools/virtualization/cloudmonkey/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "cloudmonkey"; - version = "6.2.0"; + version = "6.3.0"; src = fetchFromGitHub { owner = "apache"; repo = "cloudstack-cloudmonkey"; rev = version; - sha256 = "sha256-C9e2KsnoggjWZp8gx757MbFdGxmfh+TtAd+luS3ycHU="; + sha256 = "sha256-FoouZ2udtZ68W5p32Svr8yAn0oBdWMupn1LEzqY04Oc="; }; - vendorSha256 = null; + vendorHash = null; meta = with lib; { description = "CLI for Apache CloudStack"; From 17cb9a8e810c34e7081c007dcc022c54e0433a17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 04:39:17 +0000 Subject: [PATCH 18/69] mixxx: 2.3.4 -> 2.3.5 --- pkgs/applications/audio/mixxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/mixxx/default.nix b/pkgs/applications/audio/mixxx/default.nix index e72e809e9175..0c660c3af580 100644 --- a/pkgs/applications/audio/mixxx/default.nix +++ b/pkgs/applications/audio/mixxx/default.nix @@ -52,13 +52,13 @@ mkDerivation rec { pname = "mixxx"; - version = "2.3.4"; + version = "2.3.5"; src = fetchFromGitHub { owner = "mixxxdj"; repo = "mixxx"; rev = version; - sha256 = "sha256-1hOMU/Mdk1vT0GQipn/WX2fm9ddN0mPIq7kf2i2w3xQ="; + sha256 = "sha256-NAp7RoYSI6BRw7C0ejW4pCJJYx9BG8D+BGVCVTDrggQ="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -116,7 +116,7 @@ mkDerivation rec { # mixxx installs udev rules to DATADIR instead of SYSCONFDIR # let's disable this and install udev rules manually via postInstall - # see https://github.com/mixxxdj/mixxx/blob/2.3.4/CMakeLists.txt#L1381-L1392 + # see https://github.com/mixxxdj/mixxx/blob/2.3.5/CMakeLists.txt#L1381-L1392 cmakeFlags = [ "-DINSTALL_USER_UDEV_RULES=OFF" ]; From 05ad50d1ff5e958f554211a12989c6d0f2a0f23a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 05:23:34 +0000 Subject: [PATCH 19/69] velero: 1.10.3 -> 1.11.0 --- pkgs/applications/networking/cluster/velero/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/velero/default.nix b/pkgs/applications/networking/cluster/velero/default.nix index 063137ed5c03..3690464cebbe 100644 --- a/pkgs/applications/networking/cluster/velero/default.nix +++ b/pkgs/applications/networking/cluster/velero/default.nix @@ -2,14 +2,14 @@ buildGoModule rec { pname = "velero"; - version = "1.10.3"; + version = "1.11.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "velero"; rev = "v${version}"; - sha256 = "sha256-tNWFZrvq9bDV00TSM+q9D05Tc25judNzRxn0nU/RnCc="; + sha256 = "sha256-vrRVNVcNahTC+HSHr7Bw3WedNhe+SSX03P65C5xiUnw="; }; ldflags = [ @@ -20,7 +20,7 @@ buildGoModule rec { "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=none" ]; - vendorHash = "sha256-8yyZ6qIQqpl9PSvaCwhU/i2ZwRe171oMVGqFWeOZExo="; + vendorHash = "sha256-WkJk+46+9U4TegDnGtQ+EoqqV/D7githz2pJvxCbV4c="; excludedPackages = [ "issue-template-gen" "release-tools" "v1" "velero-restic-restore-helper" ]; From 957563496326be189ca8c0b7494799f8368d7a8f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 06:00:35 +0000 Subject: [PATCH 20/69] python311Packages.cinemagoer: 2022.12.27 -> 2023.5.1 --- pkgs/development/python-modules/cinemagoer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cinemagoer/default.nix b/pkgs/development/python-modules/cinemagoer/default.nix index ab9507a2e41c..33cff05b3850 100644 --- a/pkgs/development/python-modules/cinemagoer/default.nix +++ b/pkgs/development/python-modules/cinemagoer/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "cinemagoer"; - version = "2022.12.27"; + version = "2023.5.1"; src = fetchPypi { inherit pname version; - hash = "sha256-uUq/6Uijv6krBNCa5ftBWG/uYLs/5pLyDONLvBoxjYo="; + hash = "sha256-XOHXeuZUZwFhjxHlsVVqGdGO3srRttfZaXPsNJQbGPI="; }; propagatedBuildInputs = [ From 75ae91d5059c2b729e1f0c65d98c1770a04786b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 06:01:32 +0000 Subject: [PATCH 21/69] libcouchbase: 3.3.6 -> 3.3.7 --- pkgs/development/libraries/libcouchbase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index 745c0e5eff60..faf9029b8fc7 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libcouchbase"; - version = "3.3.6"; + version = "3.3.7"; src = fetchFromGitHub { owner = "couchbase"; repo = "libcouchbase"; rev = version; - sha256 = "sha256-sq/sPEZO6/9WYukOQ1w47ZTW0G8uLCJqnBS6mTD6P+M="; + sha256 = "sha256-EPVz9+qEuJe4VGXNuUnbH61EDxdyohZhxoxleO5j/Uk="; }; cmakeFlags = [ "-DLCB_NO_MOCK=ON" ]; From 53c8cd6af820e96057065f33d37edf630e1dd4a3 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sun, 2 Oct 2022 18:03:41 -0700 Subject: [PATCH 22/69] zfs.meta.platforms: restrict to upstream-supported $TARGET_CPUs --- pkgs/os-specific/linux/zfs/generic.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index 88838e8cabac..50010a55a90a 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -212,7 +212,17 @@ stdenv'.mkDerivation { homepage = "https://github.com/openzfs/zfs"; changelog = "https://github.com/openzfs/zfs/releases/tag/zfs-${version}"; license = lib.licenses.cddl; - platforms = lib.platforms.linux; + + # The case-block for TARGET_CPU has branches for only five CPU families, + # which prevents ZFS from building on any other platform. Since the NixOS + # `boot.zfs.enabled` property is `readOnly`, excluding platforms where ZFS + # does not build is the only way to produce a NixOS installer on such + # platforms. + # https://github.com/openzfs/zfs/blob/6a6bd493988c75331deab06e5352a9bed035a87d/config/always-arch.m4#L16 + platforms = + with lib.systems.inspect.patterns; + map (p: p // isLinux) [ isx86_32 isx86_64 isPower isAarch64 isSparc ]; + maintainers = with lib.maintainers; [ jcumming jonringer globin raitobezarius ]; mainProgram = "zfs"; # If your Linux kernel version is not yet supported by zfs, try zfsUnstable. From 146f2449a19101ee202aa578a2b1d7377779890b Mon Sep 17 00:00:00 2001 From: Colin Date: Mon, 15 May 2023 10:38:22 +0000 Subject: [PATCH 23/69] kiwix-tools: 3.4.0 -> 3.5.0 upstream changelog: almost entirely documentation and CI improvements. --- pkgs/applications/misc/kiwix/tools.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/kiwix/tools.nix b/pkgs/applications/misc/kiwix/tools.nix index fe70f5b317a2..fcc99cf41403 100644 --- a/pkgs/applications/misc/kiwix/tools.nix +++ b/pkgs/applications/misc/kiwix/tools.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, gitUpdater , icu , libkiwix , meson @@ -10,13 +11,13 @@ stdenv.mkDerivation rec { pname = "kiwix-tools"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "kiwix"; repo = "kiwix-tools"; rev = version; - sha256 = "sha256-r3/aTH/YoDuYpKLPakP4toS3OtiRueTUjmR34rdmr+w="; + sha256 = "sha256-bOxi51H28LhA+5caX6kllIY5B3Q1FoGVFadFIhYRkG0="; }; nativeBuildInputs = [ @@ -30,6 +31,8 @@ stdenv.mkDerivation rec { libkiwix ]; + passthru.updateScript = gitUpdater { }; + meta = with lib; { description = "Command line Kiwix tools: kiwix-serve, kiwix-manage, ..."; homepage = "https://kiwix.org"; From 538dfc605c5769494a40708868a2129891661434 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Mon, 15 May 2023 18:56:39 +0800 Subject: [PATCH 24/69] python3Packages.justbases: 0.15 -> 0.15.2 Diff: https://github.com/mulkieran/justbases/compare/refs/tags/v0.15...v0.15.2 --- .../python-modules/justbases/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/justbases/default.nix b/pkgs/development/python-modules/justbases/default.nix index 1ea6140147fc..dfa4d254654c 100644 --- a/pkgs/development/python-modules/justbases/default.nix +++ b/pkgs/development/python-modules/justbases/default.nix @@ -1,23 +1,30 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, unittestCheckHook , hypothesis }: buildPythonPackage rec { pname = "justbases"; - version = "0.15"; + version = "0.15.2"; - src = fetchPypi { - inherit pname version; - hash = "sha256-vQEfC8Z7xMM/fhBG6jSuhLEP/Iece5Rje1yqbpjVuPg="; + src = fetchFromGitHub { + owner = "mulkieran"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-XraUh3beI2JqKPRHYN5W3Tn3gg0GJCwhnhHIOFdzh6U="; }; - nativeCheckInputs = [ hypothesis ]; + nativeCheckInputs = [ + unittestCheckHook + hypothesis + ]; meta = with lib; { description = "conversion of ints and rationals to any base"; - homepage = "https://pythonhosted.org/justbases"; + homepage = "https://github.com/mulkieran/justbases"; + changelog = "https://github.com/mulkieran/justbases/blob/v${version}/CHANGES.txt"; license = licenses.lgpl2Plus; maintainers = with maintainers; [ nickcao ]; }; From 32866f8d58979e8dbdf92bfaa72d2883eee861f7 Mon Sep 17 00:00:00 2001 From: Xyz00777 <52142054+Xyz00777@users.noreply.github.com> Date: Fri, 14 Apr 2023 00:20:18 +0200 Subject: [PATCH 25/69] nixos/syncthing: use rfc42 style settings --- .../modules/services/networking/syncthing.nix | 538 +++++++++--------- nixos/tests/syncthing-init.nix | 16 +- 2 files changed, 275 insertions(+), 279 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index 3d41fe4013ea..b5ebda6da045 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -7,25 +7,20 @@ let opt = options.services.syncthing; defaultUser = "syncthing"; defaultGroup = defaultUser; + settingsFormat = pkgs.formats.json { }; - devices = mapAttrsToList (name: device: { + devices = mapAttrsToList (_: device: device // { deviceID = device.id; - inherit (device) name addresses introducer autoAcceptFolders; - }) cfg.devices; + }) cfg.settings.devices; - folders = mapAttrsToList ( _: folder: { - inherit (folder) path id label type; - devices = map (device: { deviceId = cfg.devices.${device}.id; }) folder.devices; - rescanIntervalS = folder.rescanInterval; - fsWatcherEnabled = folder.watch; - fsWatcherDelayS = folder.watchDelay; - ignorePerms = folder.ignorePerms; - ignoreDelete = folder.ignoreDelete; - versioning = folder.versioning; - }) (filterAttrs ( - _: folder: - folder.enable - ) cfg.folders); + folders = mapAttrsToList (_: folder: folder // { + devices = map (device: + if builtins.isString device then + { deviceId = cfg.settings.devices.${device}.id; } + else + device + ) folder.devices; + }) cfg.settings.folders; updateConfig = pkgs.writers.writeDash "merge-syncthing-config" '' set -efu @@ -54,10 +49,10 @@ let old_cfg=$(curl ${cfg.guiAddress}/rest/config) # generate the new config by merging with the NixOS config options - new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c '. * { - "devices": (${builtins.toJSON devices}${optionalString (cfg.devices == {} || ! cfg.overrideDevices) " + .devices"}), - "folders": (${builtins.toJSON folders}${optionalString (cfg.folders == {} || ! cfg.overrideFolders) " + .folders"}) - } * ${builtins.toJSON cfg.extraOptions}') + new_cfg=$(printf '%s\n' "$old_cfg" | ${pkgs.jq}/bin/jq -c ${escapeShellArg ''. * ${builtins.toJSON cfg.settings} * { + "devices": (${builtins.toJSON devices}${optionalString (cfg.settings.devices == {} || ! cfg.overrideDevices) " + .devices"}), + "folders": (${builtins.toJSON folders}${optionalString (cfg.settings.folders == {} || ! cfg.overrideFolders) " + .folders"}) + }''}) # send the new config curl -X PUT -d "$new_cfg" ${cfg.guiAddress}/rest/config @@ -99,287 +94,282 @@ in { default = true; description = mdDoc '' Whether to delete the devices which are not configured via the - [devices](#opt-services.syncthing.devices) option. + [devices](#opt-services.syncthing.settings.devices) option. If set to `false`, devices added via the web interface will persist and will have to be deleted manually. ''; }; - devices = mkOption { - default = {}; - description = mdDoc '' - Peers/devices which Syncthing should communicate with. - - Note that you can still add devices manually, but those changes - will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices) - is enabled. - ''; - example = { - bigbox = { - id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; - addresses = [ "tcp://192.168.0.10:51820" ]; - }; - }; - type = types.attrsOf (types.submodule ({ name, ... }: { - options = { - - name = mkOption { - type = types.str; - default = name; - description = lib.mdDoc '' - The name of the device. - ''; - }; - - addresses = mkOption { - type = types.listOf types.str; - default = []; - description = lib.mdDoc '' - The addresses used to connect to the device. - If this is left empty, dynamic configuration is attempted. - ''; - }; - - id = mkOption { - type = types.str; - description = mdDoc '' - The device ID. See . - ''; - }; - - introducer = mkOption { - type = types.bool; - default = false; - description = mdDoc '' - Whether the device should act as an introducer and be allowed - to add folders on this computer. - See . - ''; - }; - - autoAcceptFolders = mkOption { - type = types.bool; - default = false; - description = mdDoc '' - Automatically create or share folders that this device advertises at the default path. - See . - ''; - }; - - }; - })); - }; - overrideFolders = mkOption { type = types.bool; default = true; description = mdDoc '' Whether to delete the folders which are not configured via the - [folders](#opt-services.syncthing.folders) option. + [folders](#opt-services.syncthing.settings.folders) option. If set to `false`, folders added via the web interface will persist and will have to be deleted manually. ''; }; - folders = mkOption { - default = {}; - description = mdDoc '' - Folders which should be shared by Syncthing. - - Note that you can still add folders manually, but those changes - will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders) - is enabled. - ''; - example = literalExpression '' - { - "/home/user/sync" = { - id = "syncme"; - devices = [ "bigbox" ]; - }; - } - ''; - type = types.attrsOf (types.submodule ({ name, ... }: { + settings = mkOption { + type = types.submodule { + freeformType = settingsFormat.type; options = { - - enable = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to share this folder. - This option is useful when you want to define all folders - in one place, but not every machine should share all folders. - ''; - }; - - path = mkOption { - # TODO for release 23.05: allow relative paths again and set - # working directory to cfg.dataDir - type = types.str // { - check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/"); - description = types.str.description + " starting with / or ~/"; - }; - default = name; - description = lib.mdDoc '' - The path to the folder which should be shared. - Only absolute paths (starting with `/`) and paths relative to - the [user](#opt-services.syncthing.user)'s home directory - (starting with `~/`) are allowed. - ''; - }; - - id = mkOption { - type = types.str; - default = name; - description = lib.mdDoc '' - The ID of the folder. Must be the same on all devices. - ''; - }; - - label = mkOption { - type = types.str; - default = name; - description = lib.mdDoc '' - The label of the folder. - ''; - }; - - devices = mkOption { - type = types.listOf types.str; - default = []; + # global options + options = mkOption { + default = {}; description = mdDoc '' - The devices this folder should be shared with. Each device must - be defined in the [devices](#opt-services.syncthing.devices) option. + The options element contains all other global configuration options ''; - }; - - versioning = mkOption { - default = null; - description = mdDoc '' - How to keep changed/deleted files with Syncthing. - There are 4 different types of versioning with different parameters. - See . - ''; - example = literalExpression '' - [ - { - versioning = { - type = "simple"; - params.keep = "10"; - }; - } - { - versioning = { - type = "trashcan"; - params.cleanoutDays = "1000"; - }; - } - { - versioning = { - type = "staggered"; - fsPath = "/syncthing/backup"; - params = { - cleanInterval = "3600"; - maxAge = "31536000"; - }; - }; - } - { - versioning = { - type = "external"; - params.versionsPath = pkgs.writers.writeBash "backup" ''' - folderpath="$1" - filepath="$2" - rm -rf "$folderpath/$filepath" - '''; - }; - } - ] - ''; - type = with types; nullOr (submodule { + type = types.attrsOf (types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; options = { - type = mkOption { - type = enum [ "external" "simple" "staggered" "trashcan" ]; - description = mdDoc '' - The type of versioning. - See . + + localAnnounceEnabled = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to send announcements to the local LAN, also use such announcements to find other devices. ''; }; - fsPath = mkOption { - default = ""; - type = either str path; - description = mdDoc '' - Path to the versioning folder. - See . + + localAnnouncePort = mkOption { + type = types.int; + default = 21027; + description = lib.mdDoc '' + The port on which to listen and send IPv4 broadcast announcements to. ''; }; - params = mkOption { - type = attrsOf (either str path); - description = mdDoc '' - The parameters for versioning. Structure depends on - [versioning.type](#opt-services.syncthing.folders._name_.versioning.type). - See . + + relaysEnabled = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + When true, relays will be connected to and potentially used for device to device connections. + ''; + }; + + urAccepted = mkOption { + type = types.int; + default = 0; + description = lib.mdDoc '' + Whether the user has accepted to submit anonymous usage data. + The default, 0, mean the user has not made a choice, and Syncthing will ask at some point in the future. + "-1" means no, a number above zero means that that version of usage reporting has been accepted. + ''; + }; + + limitBandwidthInLan = mkOption { + type = types.bool; + default = false; + description = lib.mdDoc '' + Whether to apply bandwidth limits to devices in the same broadcast domain as the local device. + ''; + }; + + maxFolderConcurrency = mkOption { + type = types.int; + default = 0; + description = lib.mdDoc '' + This option controls how many folders may concurrently be in I/O-intensive operations such as syncing or scanning. + The mechanism is described in detail in a [separate chapter](https://docs.syncthing.net/advanced/option-max-concurrency.html). ''; }; }; - }); + })); }; - rescanInterval = mkOption { - type = types.int; - default = 3600; - description = lib.mdDoc '' - How often the folder should be rescanned for changes. - ''; - }; - - type = mkOption { - type = types.enum [ "sendreceive" "sendonly" "receiveonly" "receiveencrypted" ]; - default = "sendreceive"; - description = lib.mdDoc '' - Whether to only send changes for this folder, only receive them - or both. `receiveencrypted` can be used for untrusted devices. See - for reference. - ''; - }; - - watch = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether the folder should be watched for changes by inotify. - ''; - }; - - watchDelay = mkOption { - type = types.int; - default = 10; - description = lib.mdDoc '' - The delay after an inotify event is triggered. - ''; - }; - - ignorePerms = mkOption { - type = types.bool; - default = true; - description = lib.mdDoc '' - Whether to ignore permission changes. - ''; - }; - - ignoreDelete = mkOption { - type = types.bool; - default = false; + # device settings + devices = mkOption { + default = {}; description = mdDoc '' - Whether to skip deleting files that are deleted by peers. - See . - ''; - }; - }; - })); - }; + Peers/devices which Syncthing should communicate with. - extraOptions = mkOption { - type = types.addCheck (pkgs.formats.json {}).type isAttrs; + Note that you can still add devices manually, but those changes + will be reverted on restart if [overrideDevices](#opt-services.syncthing.overrideDevices) + is enabled. + ''; + example = { + bigbox = { + id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; + addresses = [ "tcp://192.168.0.10:51820" ]; + }; + }; + type = types.attrsOf (types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + options = { + + name = mkOption { + type = types.str; + default = name; + description = lib.mdDoc '' + The name of the device. + ''; + }; + + id = mkOption { + type = types.str; + description = mdDoc '' + The device ID. See . + ''; + }; + + autoAcceptFolders = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + Automatically create or share folders that this device advertises at the default path. + See . + ''; + }; + + }; + })); + }; + + # folder settings + folders = mkOption { + default = {}; + description = mdDoc '' + Folders which should be shared by Syncthing. + + Note that you can still add folders manually, but those changes + will be reverted on restart if [overrideFolders](#opt-services.syncthing.overrideFolders) + is enabled. + ''; + example = literalExpression '' + { + "/home/user/sync" = { + id = "syncme"; + devices = [ "bigbox" ]; + }; + } + ''; + type = types.attrsOf (types.submodule ({ name, ... }: { + freeformType = settingsFormat.type; + options = { + + enable = mkOption { + type = types.bool; + default = true; + description = lib.mdDoc '' + Whether to share this folder. + This option is useful when you want to define all folders + in one place, but not every machine should share all folders. + ''; + }; + + path = mkOption { + # TODO for release 23.05: allow relative paths again and set + # working directory to cfg.dataDir + type = types.str // { + check = x: types.str.check x && (substring 0 1 x == "/" || substring 0 2 x == "~/"); + description = types.str.description + " starting with / or ~/"; + }; + default = name; + description = lib.mdDoc '' + The path to the folder which should be shared. + Only absolute paths (starting with `/`) and paths relative to + the [user](#opt-services.syncthing.user)'s home directory + (starting with `~/`) are allowed. + ''; + }; + + id = mkOption { + type = types.str; + default = name; + description = lib.mdDoc '' + The ID of the folder. Must be the same on all devices. + ''; + }; + + label = mkOption { + type = types.str; + default = name; + description = lib.mdDoc '' + The label of the folder. + ''; + }; + + devices = mkOption { + type = types.listOf types.str; + default = []; + description = mdDoc '' + The devices this folder should be shared with. Each device must + be defined in the [devices](#opt-services.syncthing.settings.devices) option. + ''; + }; + + versioning = mkOption { + default = null; + description = mdDoc '' + How to keep changed/deleted files with Syncthing. + There are 4 different types of versioning with different parameters. + See . + ''; + example = literalExpression '' + [ + { + versioning = { + type = "simple"; + params.keep = "10"; + }; + } + { + versioning = { + type = "trashcan"; + params.cleanoutDays = "1000"; + }; + } + { + versioning = { + type = "staggered"; + fsPath = "/syncthing/backup"; + params = { + cleanInterval = "3600"; + maxAge = "31536000"; + }; + }; + } + { + versioning = { + type = "external"; + params.versionsPath = pkgs.writers.writeBash "backup" ''' + folderpath="$1" + filepath="$2" + rm -rf "$folderpath/$filepath" + '''; + }; + } + ] + ''; + type = with types; nullOr (submodule { + options = { + type = mkOption { + type = enum [ "external" "simple" "staggered" "trashcan" ]; + description = mdDoc '' + The type of versioning. + See . + ''; + }; + }; + }); + }; + + copyOwnershipFromParent = mkOption { + type = types.bool; + default = false; + description = mdDoc '' + On Unix systems, tries to copy file/folder ownership from the parent directory (the directory it’s located in). + Requires running Syncthing as a privileged user, or granting it additional capabilities (e.g. CAP_CHOWN on Linux). + ''; + }; + }; + })); + }; + + }; + }; default = {}; description = mdDoc '' Extra configuration options for Syncthing. @@ -530,6 +520,10 @@ in { This option was removed because Syncthing now has the inotify functionality included under the name "fswatcher". It can be enabled on a per-folder basis through the web interface. '') + (mkRenamedOptionModule [ "services" "syncthing" "extraOptions" ] [ "services" "syncthing" "settings" ]) + (mkRenamedOptionModule [ "services" "syncthing" "folders" ] [ "services" "syncthing" "settings" "folders" ]) + (mkRenamedOptionModule [ "services" "syncthing" "devices" ] [ "services" "syncthing" "settings" "devices" ]) + (mkRenamedOptionModule [ "services" "syncthing" "options" ] [ "services" "syncthing" "settings" "options" ]) ] ++ map (o: mkRenamedOptionModule [ "services" "syncthing" "declarative" o ] [ "services" "syncthing" o ] ) [ "cert" "key" "devices" "folders" "overrideDevices" "overrideFolders" "extraOptions"]; @@ -616,7 +610,7 @@ in { }; }; syncthing-init = mkIf ( - cfg.devices != {} || cfg.folders != {} || cfg.extraOptions != {} + cfg.settings.devices != {} || cfg.folders != {} || cfg.extraOptions != {} ) { description = "Syncthing configuration updater"; requisite = [ "syncthing.service" ]; diff --git a/nixos/tests/syncthing-init.nix b/nixos/tests/syncthing-init.nix index fcd90739e6a5..435813e58066 100644 --- a/nixos/tests/syncthing-init.nix +++ b/nixos/tests/syncthing-init.nix @@ -9,14 +9,16 @@ in { nodes.machine = { services.syncthing = { enable = true; - devices.testDevice = { - id = testId; + settings = { + devices.testDevice = { + id = testId; + }; + folders.testFolder = { + path = "/tmp/test"; + devices = [ "testDevice" ]; + }; + gui.user = "guiUser"; }; - folders.testFolder = { - path = "/tmp/test"; - devices = [ "testDevice" ]; - }; - extraOptions.gui.user = "guiUser"; }; }; From 5c1696e3a501941ad576afe0b9aa5be91b771b1a Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Mon, 15 May 2023 08:55:38 -0400 Subject: [PATCH 26/69] teams-for-linux: 1.0.83 -> 1.0.88 --- .../instant-messengers/teams-for-linux/default.nix | 4 ++-- .../screensharing-wayland-hack-fix.patch | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix index acd2edbc59b4..ba89b2163820 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "teams-for-linux"; - version = "1.0.83"; + version = "1.0.88"; src = fetchFromGitHub { owner = "IsmaelMartinez"; repo = pname; rev = "v${version}"; - sha256 = "sha256-2tCBFc4CEgaYJq5fMbHi+M/Cz5Eeo2Slqgu9xUUkUjA="; + sha256 = "sha256-eaXW52e+YJbL+0d2Cqrpp6M11rGsyNfIhgjHLzLDbWQ="; }; offlineCache = fetchYarnDeps { diff --git a/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch b/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch index 3e5d993e869e..1ae26c06f097 100644 --- a/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch +++ b/pkgs/applications/networking/instant-messengers/teams-for-linux/screensharing-wayland-hack-fix.patch @@ -1,14 +1,14 @@ diff --git a/app/index.js b/app/index.js -index 20ccf43..b251f62 100644 +index ea89608..98f4a90 100644 --- a/app/index.js +++ b/app/index.js @@ -1,4 +1,4 @@ -const { app, ipcMain, desktopCapturer, systemPreferences, powerMonitor } = require('electron'); +const { app, ipcMain, desktopCapturer, nativeImage, systemPreferences, powerMonitor } = require('electron'); const path = require('path'); + const fs = require('fs'); const { LucidLog } = require('lucid-log'); - const isDev = require('electron-is-dev'); -@@ -93,7 +93,16 @@ if (!gotTheLock) { +@@ -97,7 +97,16 @@ if (!gotTheLock) { ipcMain.handle('getSystemIdleState', handleGetSystemIdleState); ipcMain.handle('getZoomLevel', handleGetZoomLevel); ipcMain.handle('saveZoomLevel', handleSaveZoomLevel); @@ -23,6 +23,6 @@ index 20ccf43..b251f62 100644 + thumbnail: nativeImage.createEmpty() + }]) + : desktopCapturer.getSources(opts)); + ipcMain.handle('getCustomBGList', handleGetCustomBGList); ipcMain.on('play-notification-sound', playNotificationSound); - } - + ipcMain.on('user-status-changed', userStatusChangedHandler); From 892ed4125cd71880afdf216771d98e2b5883242c Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 15 May 2023 16:45:00 +0200 Subject: [PATCH 27/69] urbit: add sourceProvenance --- pkgs/misc/urbit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/misc/urbit/default.nix b/pkgs/misc/urbit/default.nix index d0e1d3c5451c..389642c2e9cb 100644 --- a/pkgs/misc/urbit/default.nix +++ b/pkgs/misc/urbit/default.nix @@ -34,5 +34,6 @@ stdenv.mkDerivation rec { platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin"]; maintainers = [ maintainers.matthew-levan ]; license = licenses.mit; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } From 4f57c4c1f9fffdc2e572434bb684fac7bde921e7 Mon Sep 17 00:00:00 2001 From: Mahmoud Ayman Date: Mon, 15 May 2023 19:48:47 +0300 Subject: [PATCH 28/69] anki-bin: 2.1.62 -> 2.1.63 --- pkgs/games/anki/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index dab92aa97d60..5c8b5c3ab7ff 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,22 +3,22 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.62"; + version = "2.1.63"; sources = { linux = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; - sha256 = "sha256-vsuR+pDqjPGejlxrDPCxKVnvTilRDGGhMDDKSQhVxVQ="; + sha256 = "sha256-AioLmz8nvrvW1c5e5cYfs/zE+YqA4D/X2GUekugOhGo="; }; # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version darwin-x86_64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; - sha256 = "sha256-8TMdNEnnlDQrk+TVlsmvFxoqrsCU2BRY6hnaC3PGdYo="; + sha256 = "sha256-rkVPRFZP7v2XEqWGypw0jTw/0CBe1u2tQF9L5omcIoQ="; }; darwin-aarch64 = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; - sha256 = "sha256-zdrw3AE1ijlJryGf30YLr71TtoT6ANHvi+1BweZiFM8="; + sha256 = "sha256-GTrmm9JJPiVR+MFfF6u0s4yHqTAz/p2ktX5lOLj2jcA="; }; }; From 66f045a65f89ec18af9e1f8cf5eb45cef37a0eee Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 3 May 2023 13:15:00 +0200 Subject: [PATCH 29/69] betaflight-configurator: reduce size This reduces the size of the output from 512.5M to 233.9M. --- .../science/robotics/betaflight-configurator/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/science/robotics/betaflight-configurator/default.nix b/pkgs/applications/science/robotics/betaflight-configurator/default.nix index a76327b854b0..e8e5fbba4e49 100644 --- a/pkgs/applications/science/robotics/betaflight-configurator/default.nix +++ b/pkgs/applications/science/robotics/betaflight-configurator/default.nix @@ -19,11 +19,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-9FzMyBIR2u1zXHtTWJABM6RF1+OyjYdEPlRwtig9blI="; }; + # remove large unneeded files + postUnpack = '' + find -name "lib*.so" -delete + ''; + nativeBuildInputs = [ wrapGAppsHook unzip ]; buildInputs = [ gsettings-desktop-schemas gtk3 ]; installPhase = '' + runHook preInstall mkdir -p $out/bin \ $out/opt/${pname} @@ -32,6 +38,7 @@ stdenv.mkDerivation rec { cp -r ${desktopItem}/share/applications $out/share/ makeWrapper ${nwjs}/bin/nw $out/bin/${pname} --add-flags $out/opt/${pname} + runHook postInstall ''; meta = with lib; { From 2abc432af3456a360446cebf942f2bbc10f03184 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 19:09:24 +0000 Subject: [PATCH 30/69] bilibili: 1.9.2-1 -> 1.10.1-1 --- pkgs/applications/video/bilibili/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/bilibili/default.nix b/pkgs/applications/video/bilibili/default.nix index c7c2b6faa7a2..a2f3031ab21e 100644 --- a/pkgs/applications/video/bilibili/default.nix +++ b/pkgs/applications/video/bilibili/default.nix @@ -7,10 +7,10 @@ stdenv.mkDerivation rec { pname = "bilibili"; - version = "1.9.2-1"; + version = "1.10.1-1"; src = fetchurl { url = "https://github.com/msojocs/bilibili-linux/releases/download/v${version}/io.github.msojocs.bilibili_${version}_amd64.deb"; - hash = "sha256-y3dUBImvcIG89m82RaIOa0cxJXIAIGa+n3FJkASacaY="; + hash = "sha256-Kx45erpxS66/CWmo4Csw0jhp23u03fn7r+vkq5CtJg0="; }; unpackPhase = '' From 0aab74c3efb57cd659a9679689da8036b148d2db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 19:59:05 +0000 Subject: [PATCH 31/69] python310Packages.types-pillow: 9.4.0.17 -> 9.5.0.4 --- pkgs/development/python-modules/types-pillow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pillow/default.nix b/pkgs/development/python-modules/types-pillow/default.nix index f0f79a87826f..fa0b37055c3b 100644 --- a/pkgs/development/python-modules/types-pillow/default.nix +++ b/pkgs/development/python-modules/types-pillow/default.nix @@ -5,13 +5,13 @@ buildPythonPackage rec { pname = "types-pillow"; - version = "9.4.0.17"; + version = "9.5.0.4"; format = "setuptools"; src = fetchPypi { inherit version; pname = "types-Pillow"; - hash = "sha256-fw6HHS1G+7a8feyj4C3FUs+cHotJ3rlZVQlVG+OVTkk="; + hash = "sha256-8bavR6vRUYR+4lkR/+unhImbx9x/nrqMpqWqxSKwEu8="; }; # Modules doesn't have tests From 8aaf791121944d71935c5019c1f8dffdc59edf7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 22:43:50 +0000 Subject: [PATCH 32/69] python311Packages.piccolo-theme: 0.14.0 -> 0.15.0 --- pkgs/development/python-modules/piccolo-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/piccolo-theme/default.nix b/pkgs/development/python-modules/piccolo-theme/default.nix index eded0ac8fe54..4b60c649fe9c 100644 --- a/pkgs/development/python-modules/piccolo-theme/default.nix +++ b/pkgs/development/python-modules/piccolo-theme/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "piccolo-theme"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { pname = "piccolo_theme"; inherit version; - hash = "sha256-PGPf05TQfC6Somn2PR07Y2qiOuyg+37U1l16m2LKykU="; + hash = "sha256-8VxkrzADp3yCeb02BxtT6oSP1FCX8GW4oc6OECK2hJw="; }; propagatedBuildInputs = [ From 2c768e82f9a62b8271d4b819a67654e6900911a4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 May 2023 23:01:23 +0000 Subject: [PATCH 33/69] python310Packages.dkimpy: 1.1.3 -> 1.1.4 --- pkgs/development/python-modules/dkimpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dkimpy/default.nix b/pkgs/development/python-modules/dkimpy/default.nix index 765f9032aaf6..26a378a0c42a 100644 --- a/pkgs/development/python-modules/dkimpy/default.nix +++ b/pkgs/development/python-modules/dkimpy/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "dkimpy"; - version = "1.1.3"; + version = "1.1.4"; src = fetchPypi { inherit pname version; - hash = "sha256-8zIhlR9jOBEXb9D1qGH0S8I721/cKn+jWXUxlUAbEwg="; + hash = "sha256-7bbng4OzpUx3K8n/eG5+7X12pXupRiCdmVG0P1BzqwI="; }; nativeCheckInputs = [ pytest ]; From fefa2d0387a15889c6742ad54ac664b8c7cb5762 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 01:15:45 +0200 Subject: [PATCH 34/69] python310Packages.python-roborock: 0.17.6 -> 0.18.3 Diff: https://github.com/humbertogontijo/python-roborock/compare/refs/tags/v0.17.6...v0.18.3 Changelog: https://github.com/humbertogontijo/python-roborock/blob/v0.18.3/CHANGELOG.md --- pkgs/development/python-modules/python-roborock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-roborock/default.nix b/pkgs/development/python-modules/python-roborock/default.nix index 4c6b922e4efe..ece05b267b19 100644 --- a/pkgs/development/python-modules/python-roborock/default.nix +++ b/pkgs/development/python-modules/python-roborock/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "python-roborock"; - version = "0.17.6"; + version = "0.18.3"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "humbertogontijo"; repo = "python-roborock"; rev = "refs/tags/v${version}"; - hash = "sha256-0AmtB0T8xqsd8TOh2MN+CBSLLq8hIl7QT+a2HdmGRYI="; + hash = "sha256-a1X7aRWURteIBVwl+pgHcaeWXAWv+zicz154fJgWVy4="; }; nativeBuildInputs = [ From 0216d132ca609fc7fff49da0fe1434c29d0f0300 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 01:17:07 +0200 Subject: [PATCH 35/69] python311Packages.regenmaschine: 2022.11.2 -> 2023.05.0 Diff: https://github.com/bachya/regenmaschine/compare/refs/tags/2022.11.2...2023.05.0 Changelog: https://github.com/bachya/regenmaschine/releases/tag/2023.05.0 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index a2c004fba7b8..442191cbd7bc 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.11.2"; + version = "2023.05.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-0ih0qlN9NxkYkcRl990gVyZF33ymSNUJoNFzpcnqu1o="; + hash = "sha256-u6GHDiTGa7v9tK/4VTVPQL/2kjomo0x/EGC7LD8lMvM="; }; nativeBuildInputs = [ From 9116d80df8d4e8a4feb4302d892189f377bea504 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 01:17:34 +0200 Subject: [PATCH 36/69] python310Packages.pyunifiprotect: 4.8.3 -> 4.9.0 Diff: https://github.com/briis/pyunifiprotect/compare/refs/tags/v4.8.3...v4.9.0 Changelog: https://github.com/AngellusMortis/pyunifiprotect/releases/tag/v4.9.0 --- pkgs/development/python-modules/pyunifiprotect/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyunifiprotect/default.nix b/pkgs/development/python-modules/pyunifiprotect/default.nix index 9f385b5c2584..92a8690d2786 100644 --- a/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.8.3"; + version = "4.9.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-2DR1SPWElDZcTYF6TaJK3lxqJ5Skv76X+K+y6i69bj4="; + hash = "sha256-fIkZh/fkeVzQyEa4goGnaCxOWsKLKRlw+0/nGBDmKlY="; }; postPatch = '' From b0a4b5849510b77d90a3213720ff0cc5798be939 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 00:55:58 +0200 Subject: [PATCH 37/69] ansible-lint: 6.15.0 -> 6.16.0 https://github.com/ansible/ansible-lint/releases/tag/v6.16.0 --- .../python-modules/ansible-lint/default.nix | 23 ++++++++++++------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/development/python-modules/ansible-lint/default.nix index 0307a8854557..f50b333065f6 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/development/python-modules/ansible-lint/default.nix @@ -1,35 +1,36 @@ { lib , buildPythonPackage , fetchPypi +, setuptools , setuptools-scm -, ansible-compat , ansible-core , black -, enrich , filelock , flaky , jsonschema +, packaging , pythonOlder -, pytest , pytest-xdist , pytestCheckHook +, pythonRelaxDepsHook , pyyaml , rich , ruamel-yaml +, subprocess-tee , wcmatch , yamllint }: buildPythonPackage rec { pname = "ansible-lint"; - version = "6.15.0"; + version = "6.16.0"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-TOeQzwAGdgugHYuUbYAwNwL8dFS9GcazB53ZjUBRfm8="; + hash = "sha256-34Lzk18SCeMHRAjurl6DfM7G/VLB0xJmif9BJKuwpcs="; }; postPatch = '' @@ -39,20 +40,26 @@ buildPythonPackage rec { ''; nativeBuildInputs = [ + setuptools setuptools-scm + pythonRelaxDepsHook + ]; + + pythonRelaxDeps = [ + "ruamel.yaml" ]; propagatedBuildInputs = [ - ansible-compat + # https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in ansible-core black - enrich filelock jsonschema - pytest # yes, this is an actual runtime dependency + packaging pyyaml rich ruamel-yaml + subprocess-tee wcmatch yamllint ]; From 4a98f3a900935feec206b0ef4cb9130256418aa4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 01:03:21 +0200 Subject: [PATCH 38/69] ansible-lint: Remove from python-modules This is an application, not a library. https://ansible-lint.readthedocs.io/usage/ --- .../admin/ansible/lint.nix} | 35 +++++-------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 10 insertions(+), 30 deletions(-) rename pkgs/{development/python-modules/ansible-lint/default.nix => tools/admin/ansible/lint.nix} (81%) diff --git a/pkgs/development/python-modules/ansible-lint/default.nix b/pkgs/tools/admin/ansible/lint.nix similarity index 81% rename from pkgs/development/python-modules/ansible-lint/default.nix rename to pkgs/tools/admin/ansible/lint.nix index f50b333065f6..589e4284299b 100644 --- a/pkgs/development/python-modules/ansible-lint/default.nix +++ b/pkgs/tools/admin/ansible/lint.nix @@ -1,33 +1,14 @@ { lib -, buildPythonPackage +, python3 , fetchPypi -, setuptools -, setuptools-scm -, ansible-core -, black -, filelock -, flaky -, jsonschema -, packaging -, pythonOlder -, pytest-xdist -, pytestCheckHook -, pythonRelaxDepsHook -, pyyaml -, rich -, ruamel-yaml -, subprocess-tee -, wcmatch -, yamllint +, ansible }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "ansible-lint"; version = "6.16.0"; format = "pyproject"; - disabled = pythonOlder "3.8"; - src = fetchPypi { inherit pname version; hash = "sha256-34Lzk18SCeMHRAjurl6DfM7G/VLB0xJmif9BJKuwpcs="; @@ -39,7 +20,7 @@ buildPythonPackage rec { --replace "sys.exit(1)" "" ''; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ setuptools setuptools-scm pythonRelaxDepsHook @@ -49,7 +30,7 @@ buildPythonPackage rec { "ruamel.yaml" ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ # https://github.com/ansible/ansible-lint/blob/master/.config/requirements.in ansible-core black @@ -67,7 +48,7 @@ buildPythonPackage rec { # tests can't be easily run without installing things from ansible-galaxy doCheck = false; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ flaky pytest-xdist pytestCheckHook @@ -76,7 +57,7 @@ buildPythonPackage rec { preCheck = '' # ansible wants to write to $HOME and crashes if it can't export HOME=$(mktemp -d) - export PATH=$PATH:${lib.makeBinPath [ ansible-core ]} + export PATH=$PATH:${lib.makeBinPath [ ansible ]} # create a working ansible-lint executable export PATH=$PATH:$PWD/src/ansiblelint @@ -102,7 +83,7 @@ buildPythonPackage rec { "test_discover_lintables_umlaut" ]; - makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible-core ]}" ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ansible ]}" ]; meta = with lib; { description = "Best practices checker for Ansible"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2246de4b9d11..5bec83390d0b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17567,7 +17567,7 @@ with pkgs; ansible-later = with python3.pkgs; toPythonApplication ansible-later; - ansible-lint = with python3.pkgs; toPythonApplication ansible-lint; + ansible-lint = callPackage ../tools/admin/ansible/lint.nix { }; antlr2 = callPackage ../development/tools/parsing/antlr/2.7.7.nix { }; antlr3_4 = callPackage ../development/tools/parsing/antlr/3.4.nix { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 85f68182349d..5eb1ee78bb4c 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 + ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 argon2_cffi = argon2-cffi; # added 2022-05-09 APScheduler = apscheduler; # added 2023-02-19 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fc10f81e28b8..4087aa14a5c0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -500,8 +500,6 @@ self: super: with self; { ansible-later = callPackage ../development/python-modules/ansible-later { }; - ansible-lint = callPackage ../development/python-modules/ansible-lint { }; - ansible-runner = callPackage ../development/python-modules/ansible-runner { }; ansi = callPackage ../development/python-modules/ansi { }; From 43ccbe148ff2204baeeae428dd47f1eb34a909fb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 01:04:23 +0200 Subject: [PATCH 39/69] python3Packages.ansible-compat: 4.0.2 -> 4.0.4 https://github.com/ansible/ansible-compat/releases/tag/v4.0.4 --- pkgs/development/python-modules/ansible-compat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ansible-compat/default.nix b/pkgs/development/python-modules/ansible-compat/default.nix index 60e74383de74..6de7d8a5668a 100644 --- a/pkgs/development/python-modules/ansible-compat/default.nix +++ b/pkgs/development/python-modules/ansible-compat/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "4.0.2"; + version = "4.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-JbDcWro8Q+DP3JFATlcErphX5mTCEPf4SlVm4A111/M="; + hash = "sha256-rXzr++4EVt+/7g6AJRWxEeABYCVSUFF0+jo1/wi6Izk="; }; nativeBuildInputs = [ From 23b2891f60b57ed7ce9c7a2a01ae6f76ed577def Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 01:09:45 +0200 Subject: [PATCH 40/69] ansible-doctor: Remove from python-modules This is an application, not a library. https://ansible-doctor.geekdocs.de/usage/getting-started/ --- .../admin/ansible/doctor.nix} | 23 ++++--------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 6 insertions(+), 22 deletions(-) rename pkgs/{development/python-modules/ansible-doctor/default.nix => tools/admin/ansible/doctor.nix} (78%) diff --git a/pkgs/development/python-modules/ansible-doctor/default.nix b/pkgs/tools/admin/ansible/doctor.nix similarity index 78% rename from pkgs/development/python-modules/ansible-doctor/default.nix rename to pkgs/tools/admin/ansible/doctor.nix index fa2b21cbc64b..e51d2faced9d 100644 --- a/pkgs/development/python-modules/ansible-doctor/default.nix +++ b/pkgs/tools/admin/ansible/doctor.nix @@ -1,28 +1,13 @@ { lib -, anyconfig -, appdirs -, buildPythonPackage -, colorama -, environs , fetchFromGitHub -, jinja2 -, jsonschema -, nested-lookup -, pathspec -, poetry-core -, python-json-logger -, pythonOlder -, pythonRelaxDepsHook -, ruamel-yaml +, python3 }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "ansible-doctor"; version = "2.0.4"; format = "pyproject"; - disabled = pythonOlder "3.7"; - src = fetchFromGitHub { owner = "thegeeklab"; repo = "ansible-doctor"; @@ -37,12 +22,12 @@ buildPythonPackage rec { --replace 'version = "0.0.0"' 'version = "${version}"' ''; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ anyconfig appdirs colorama diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5bec83390d0b..236fa5e2472d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17505,7 +17505,7 @@ with pkgs; meta.changelog = "https://github.com/ansible/ansible/blob/v${version}/changelogs/CHANGELOG-v${lib.versions.majorMinor version}.rst"; })); - ansible-doctor = with python3.pkgs; toPythonApplication ansible-doctor; + ansible-doctor = callPackage ../tools/admin/ansible/doctor.nix { }; phpunit = callPackage ../development/tools/misc/phpunit { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 5eb1ee78bb4c..7f981f9fd7d2 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -36,6 +36,7 @@ mapAliases ({ abodepy = jaraco-abode; # added 2023-02-01 aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 + ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16 ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 argon2_cffi = argon2-cffi; # added 2022-05-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4087aa14a5c0..750e30da0078 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -494,8 +494,6 @@ self: super: with self; { ansible-core = callPackage ../development/python-modules/ansible/core.nix { }; - ansible-doctor = callPackage ../development/python-modules/ansible-doctor { }; - ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; ansible-later = callPackage ../development/python-modules/ansible-later { }; From d0955a83cb5f76cb8cc4ef8b8efd1ba4feddcf5b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 02:22:11 +0200 Subject: [PATCH 41/69] python311Packages.coqpit: disable failing tests --- pkgs/development/python-modules/coqpit/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/coqpit/default.nix b/pkgs/development/python-modules/coqpit/default.nix index f06b5429707f..48954b7a9117 100644 --- a/pkgs/development/python-modules/coqpit/default.nix +++ b/pkgs/development/python-modules/coqpit/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, pythonAtLeast , pytestCheckHook }: @@ -25,6 +26,15 @@ buildPythonPackage rec { "coqpit.coqpit" ]; + # https://github.com/coqui-ai/coqpit/issues/40 + disabledTests = lib.optionals (pythonAtLeast "3.11")[ + "test_init_argparse_list_and_nested" + ]; + + disabledTestPaths = lib.optionals (pythonAtLeast "3.11")[ + "tests/test_nested_configs.py" + ]; + meta = with lib; { description = "Simple but maybe too simple config management through python data classes"; longDescription = '' From 64e996fd1b1399778bfe11930230845d3008204e Mon Sep 17 00:00:00 2001 From: John Chadwick Date: Mon, 15 May 2023 23:06:07 -0400 Subject: [PATCH 42/69] cdesktopenv: work around tcl8.6.13 error --- pkgs/desktops/cdesktopenv/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index e461ac9ea077..0124220346af 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -3,7 +3,7 @@ , xorgproto, libX11, bison, ksh, perl, gnum4 , libXinerama, libXt, libXext, libtirpc, motif, libXft, xbitmaps , libjpeg, libXmu, libXdmcp, libXScrnSaver, symlinkJoin, bdftopcf -, ncompress, mkfontdir, tcl, libXaw, libxcrypt, gcc, glibcLocales +, ncompress, mkfontdir, tcl-8_5, libXaw, libxcrypt, gcc, glibcLocales , autoPatchelfHook, libredirect, makeWrapper, xset, xrdb, fakeroot , rpcsvc-proto }: @@ -40,7 +40,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXinerama libXt libXext libtirpc motif libXft xbitmaps - libjpeg libXmu libXdmcp libXScrnSaver tcl libXaw ksh libxcrypt + libjpeg libXmu libXdmcp libXScrnSaver tcl-8_5 libXaw ksh libxcrypt ]; nativeBuildInputs = [ bison ncompress autoPatchelfHook makeWrapper fakeroot @@ -59,6 +59,9 @@ in stdenv.mkDerivation rec { "BOOTSTRAPCFLAGS=-I${xorgproto}/include/X11" "IMAKECPP=cpp" "LOCALE_ARCHIVE=${glibcLocales}/lib/locale/locale-archive" + # Workaround for dtdocbook issue with tcl 8.6.13. + # TODO: this might be possible to remove when updating CDE + "TCLLIB=-ltcl8.5" ]; preConfigure = '' From e83d19d547400edd5d87a55a4b76c2ef65a6c4c0 Mon Sep 17 00:00:00 2001 From: toastal Date: Tue, 16 May 2023 11:14:09 +0700 Subject: [PATCH 43/69] =?UTF-8?q?ocamlPackages.uring:=200.5=20=E2=86=92=20?= =?UTF-8?q?0.6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://github.com/ocaml-multicore/ocaml-uring/releases/tag/v0.6 --- pkgs/development/ocaml-modules/uring/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/uring/default.nix b/pkgs/development/ocaml-modules/uring/default.nix index b6cc3e4c9945..0287f5843a4c 100644 --- a/pkgs/development/ocaml-modules/uring/default.nix +++ b/pkgs/development/ocaml-modules/uring/default.nix @@ -10,14 +10,14 @@ buildDunePackage rec { pname = "uring"; - version = "0.5"; + version = "0.6"; minimalOCamlVersion = "4.12"; duneVersion = "3"; src = fetchurl { - url = "https://github.com/ocaml-multicore/ocaml-uring/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "106w7mabqihdhj4csk9jfqag220rwhqdp5lapn0xmw2035scvxvk"; + url = "https://github.com/ocaml-multicore/ocaml-${pname}/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "ZltD9JnF1lJs0xjWwFXBfWMP8e5XRhCaB2P4iqHFreo="; }; propagatedBuildInputs = [ From afc0e8752728fe344bc3f34799d6dc87d914531f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 May 2023 05:49:43 +0000 Subject: [PATCH 44/69] python310Packages.miniaudio: 1.56 -> 1.57 --- pkgs/development/python-modules/miniaudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/miniaudio/default.nix b/pkgs/development/python-modules/miniaudio/default.nix index ccfab47ce1d1..f82f91f303a8 100644 --- a/pkgs/development/python-modules/miniaudio/default.nix +++ b/pkgs/development/python-modules/miniaudio/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "miniaudio"; - version = "1.56"; + version = "1.57"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "irmen"; repo = "pyminiaudio"; rev = "refs/tags/v${version}"; - hash = "sha256-vNh9BupU6T+Gfa8fdt8r3/vqtTtfVDyrxM9GkFUcDcI="; + hash = "sha256-jAGJEXNDclcGHnoDYMjQXz5ZS9U9pmIWEHzgYKp49/o="; }; postPatch = '' From 9b7b37f4e2a77979a632806977540e3fd0f23dd8 Mon Sep 17 00:00:00 2001 From: stepech <29132060+stepech@users.noreply.github.com> Date: Mon, 15 May 2023 16:34:27 +0200 Subject: [PATCH 45/69] burpsuite: 2023.3.5 -> 2023.4.3 https://portswigger.net/burp/releases#community --- pkgs/tools/networking/burpsuite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/burpsuite/default.nix b/pkgs/tools/networking/burpsuite/default.nix index 32586ad24b06..d8c9e79edd62 100644 --- a/pkgs/tools/networking/burpsuite/default.nix +++ b/pkgs/tools/networking/burpsuite/default.nix @@ -1,6 +1,6 @@ { lib, fetchurl, jdk, buildFHSEnv, unzip, makeDesktopItem }: let - version = "2023.3.5"; + version = "2023.4.3"; src = fetchurl { name = "burpsuite.jar"; @@ -8,7 +8,7 @@ let "https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" "https://web.archive.org/web/https://portswigger.net/burp/releases/download?productId=100&version=${version}&type=Jar" ]; - sha256 = "ef1b1094bbe7388b5b4d515b8e42347243efb34a4d8acc27d9d553fe62f45fb5"; + sha256 = "2e756e48f31b88590445f2b1dc4806c2f3613f9fde4dab357acb3850fd77303e"; }; name = "burpsuite-${version}"; From 4341067c94e593d68c52a243c4d55532f837ebc0 Mon Sep 17 00:00:00 2001 From: Moritz 'e1mo' Fromm Date: Tue, 16 May 2023 08:35:15 +0200 Subject: [PATCH 46/69] dokuwiki: 2023-04-04 -> 2023-04-04a Hotfix for a discovered vulnerability (deemed as high[^1]) in the RSS parser allowing cross-site scripting via injected, arbitrary, JavaScript. Changes: https://github.com/dokuwiki/dokuwiki/compare/release-2023-04-04...release-2023-04-04a [^1]: https://huntr.dev/bounties/c6119106-1a5c-464c-94dd-ee7c5d0bece0/ --- pkgs/servers/web-apps/dokuwiki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/dokuwiki/default.nix b/pkgs/servers/web-apps/dokuwiki/default.nix index 888ca6ca2399..a95a6acdfb7c 100644 --- a/pkgs/servers/web-apps/dokuwiki/default.nix +++ b/pkgs/servers/web-apps/dokuwiki/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "dokuwiki"; - version = "2023-04-04"; + version = "2023-04-04a"; src = fetchFromGitHub { owner = "dokuwiki"; repo = pname; rev = "release-${version}"; - sha256 = "sha256-QJnXKsEhvEcE88wvfMZR2j7X/pW8+28zlEnxhvhl+44="; + sha256 = "sha256-PVfJfGYa2Drf4ljnnhb7kNpjfQlW4dDt5Xd5h+C8tP4="; }; preload = writeText "preload.php" '' From 85d235bdca5a8ea1a1f1b915612dccf118f97b64 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 May 2023 06:51:20 +0000 Subject: [PATCH 47/69] spicetify-cli: 2.18.0 -> 2.18.1 --- pkgs/applications/misc/spicetify-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/spicetify-cli/default.nix b/pkgs/applications/misc/spicetify-cli/default.nix index fd8361592f99..5a3f78011085 100644 --- a/pkgs/applications/misc/spicetify-cli/default.nix +++ b/pkgs/applications/misc/spicetify-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.18.0"; + version = "2.18.1"; src = fetchFromGitHub { owner = "spicetify"; repo = pname; rev = "v${version}"; - sha256 = "sha256-k9fbChpHy997Mj+U9n/iiSGDdsHZ22AoYUkCHUMGfbo="; + sha256 = "sha256-BZuvuvbFCZ6VaztlZhlUZhJ7vf4W49mVHiORhH8oH2Y="; }; - vendorHash = "sha256-mAtwbYuzkHUqG4fr2JffcM8PmBsBrnHWyl4DvVzfJCw="; + vendorHash = "sha256-g0SuXDzYjg0mGzeDuB2tQnVnDmTiL5vw0r9QWSgIs3Q="; ldflags = [ "-s -w" From e6a35faa2739f8f0baaff2feffd5963b25813fe5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 May 2023 07:43:57 +0000 Subject: [PATCH 48/69] python310Packages.pytest-testmon: 2.0.2 -> 2.0.6 --- pkgs/development/python-modules/pytest-testmon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-testmon/default.nix b/pkgs/development/python-modules/pytest-testmon/default.nix index 236fef58c29c..3b8f61e2452c 100644 --- a/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/pkgs/development/python-modules/pytest-testmon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "2.0.2"; + version = "2.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tarpas"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-hQJ52CuCBgxGcbbkbqsshh+lcevrgD8Xjde2ErghRKk="; + hash = "sha256-hyWt5Dk8CK9b8DhcZGHFnHGAgIefvIoM3AjogZPY+i0="; }; nativeBuildInputs = [ From fab6fc35329b188c05d9b595ef4ae1895424ba5c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Tue, 16 May 2023 09:48:23 +0200 Subject: [PATCH 49/69] ansible-later: Remove from python-modules This is an application, not a library. --- .../admin/ansible/later.nix} | 31 +++---------------- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 4 files changed, 7 insertions(+), 29 deletions(-) rename pkgs/{development/python-modules/ansible-later/default.nix => tools/admin/ansible/later.nix} (77%) diff --git a/pkgs/development/python-modules/ansible-later/default.nix b/pkgs/tools/admin/ansible/later.nix similarity index 77% rename from pkgs/development/python-modules/ansible-later/default.nix rename to pkgs/tools/admin/ansible/later.nix index cd30731a9890..9cc7ffb38eb5 100644 --- a/pkgs/development/python-modules/ansible-later/default.nix +++ b/pkgs/tools/admin/ansible/later.nix @@ -1,34 +1,13 @@ { lib -, ansible -, ansible-core -, anyconfig -, appdirs -, buildPythonPackage -, colorama , fetchFromGitHub -, flake8 -, jsonschema -, nested-lookup -, pathspec -, poetry-core -, pytest-mock -, python-json-logger -, pytestCheckHook -, pythonRelaxDepsHook -, pythonOlder -, pyyaml -, toolz -, unidiff -, yamllint +, python3 }: -buildPythonPackage rec { +python3.pkgs.buildPythonApplication rec { pname = "ansible-later"; version = "3.3.1"; format = "pyproject"; - disabled = pythonOlder "3.8"; - src = fetchFromGitHub { owner = "thegeeklab"; repo = pname; @@ -53,12 +32,12 @@ buildPythonPackage rec { "yamllint" ]; - nativeBuildInputs = [ + nativeBuildInputs = with python3.pkgs; [ poetry-core pythonRelaxDepsHook ]; - propagatedBuildInputs = [ + propagatedBuildInputs = with python3.pkgs; [ ansible ansible-core anyconfig @@ -75,7 +54,7 @@ buildPythonPackage rec { yamllint ]; - nativeCheckInputs = [ + nativeCheckInputs = with python3.pkgs; [ pytest-mock pytestCheckHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 236fa5e2472d..460e39d3fde4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17565,7 +17565,7 @@ with pkgs; zig = buildPackages.zig_0_10; }; - ansible-later = with python3.pkgs; toPythonApplication ansible-later; + ansible-later = callPackage ../tools/admin/ansible/later.nix { }; ansible-lint = callPackage ../tools/admin/ansible/lint.nix { }; diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 7f981f9fd7d2..ddfc8c292077 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -37,6 +37,7 @@ mapAliases ({ aioh2 = throw "aioh2 has been removed because it is abandoned and broken."; # Added 2022-03-30 ansible-base = throw "ansible-base has been removed, because it is end of life"; # added 2022-03-30 ansible-doctor = throw "ansible-doctor has been promoted to a top-level attribute"; # Added 2023-05-16 + ansible-later = throw "ansible-later has been promoted to a top-level attribute"; # Added 2023-05-16 ansible-lint = throw "ansible-lint has been promoted to a top-level attribute"; # Added 2023-05-16 anyjson = throw "anyjson has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-01-18 argon2_cffi = argon2-cffi; # added 2022-05-09 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 750e30da0078..d22fb5d840e4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -496,8 +496,6 @@ self: super: with self; { ansible-kernel = callPackage ../development/python-modules/ansible-kernel { }; - ansible-later = callPackage ../development/python-modules/ansible-later { }; - ansible-runner = callPackage ../development/python-modules/ansible-runner { }; ansi = callPackage ../development/python-modules/ansi { }; From bd91922dbc5acbd0d6dbd1235c7c621e9d7fdb57 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 16 May 2023 15:43:10 +0800 Subject: [PATCH 50/69] maintainers/team-list: add bobby285271 to mate and xfce I did the recent updates for MATE and Xfce and am okay to be pinged when things go wrong. --- maintainers/team-list.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index 58c940af97b2..f3d9037cd55a 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -522,6 +522,7 @@ with lib.maintainers; { mate = { members = [ + bobby285271 j03 romildo ]; @@ -828,6 +829,7 @@ with lib.maintainers; { xfce = { members = [ + bobby285271 romildo muscaln ]; From 6e3bedf3aa57adf1c76147b3fec091b498a27451 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 May 2023 07:53:35 +0000 Subject: [PATCH 51/69] geoipupdate: 5.1.0 -> 5.1.1 --- pkgs/applications/misc/geoipupdate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/geoipupdate/default.nix b/pkgs/applications/misc/geoipupdate/default.nix index dd28d78b19cd..e1dd66df7fc6 100644 --- a/pkgs/applications/misc/geoipupdate/default.nix +++ b/pkgs/applications/misc/geoipupdate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "geoipupdate"; - version = "5.1.0"; + version = "5.1.1"; src = fetchFromGitHub { owner = "maxmind"; repo = "geoipupdate"; rev = "v${version}"; - sha256 = "sha256-DYZqvLuPcoek07YJLur/By9Wi2VxDz6C7jAOVmdKt4Y="; + sha256 = "sha256-n32HxXNk/mHYL6Dn3c8jmTIwrwOfyyd/dui1Uw/xf90="; }; vendorHash = "sha256-t6uhFvuR54Q4nYur/3oBzAbBTaIjzHfx7GeEk6X/0os="; From da46b2cce087348f1fda8f0be0c91d09b8305faa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 May 2023 08:06:20 +0000 Subject: [PATCH 52/69] python310Packages.requests-hawk: 1.1.1 -> 1.2.1 --- pkgs/development/python-modules/requests-hawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-hawk/default.nix b/pkgs/development/python-modules/requests-hawk/default.nix index 52790b5f2cc9..74bafbcabca5 100644 --- a/pkgs/development/python-modules/requests-hawk/default.nix +++ b/pkgs/development/python-modules/requests-hawk/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "requests-hawk"; - version = "1.1.1"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "4c74bd31b581f6d2b36d575bb537b1f29469509f560f5050339a48195d48929b"; + sha256 = "sha256-rZIFBCyUvbFa+qGbB4DhEHeyTZ5c/6wfs9JssIqkNbc="; }; propagatedBuildInputs = [ mohawk requests ]; From 872987d040303394aef2fdba5ea5a3ee93e66e67 Mon Sep 17 00:00:00 2001 From: Kerstin Date: Tue, 16 May 2023 10:50:34 +0200 Subject: [PATCH 53/69] beam/mixRelease: default stripDebug to false due frequent runtime errors (#232107) This flag appears to cause issues in 3 out 4 users of mixRelease in Nixpkgs, plus Mobilizon, which isn't merged yet. It might be safer to set it to fals for now, as the runtime error messages produced by it are quite cryptic. --- pkgs/development/beam-modules/elixir-ls/default.nix | 2 ++ pkgs/development/beam-modules/mix-release.nix | 11 ++++++++++- pkgs/servers/akkoma/default.nix | 3 --- pkgs/servers/pleroma/default.nix | 1 - pkgs/servers/web-apps/plausible/default.nix | 3 --- 5 files changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/beam-modules/elixir-ls/default.nix b/pkgs/development/beam-modules/elixir-ls/default.nix index 885b6eec49af..8573b4b7ca16 100644 --- a/pkgs/development/beam-modules/elixir-ls/default.nix +++ b/pkgs/development/beam-modules/elixir-ls/default.nix @@ -16,6 +16,8 @@ in mixRelease { inherit pname version src elixir; + stripDebug = true; + mixFodDeps = fetchMixDeps { pname = "mix-deps-${pname}"; inherit src version elixir; diff --git a/pkgs/development/beam-modules/mix-release.nix b/pkgs/development/beam-modules/mix-release.nix index 1a926148d599..1d40da27ecba 100644 --- a/pkgs/development/beam-modules/mix-release.nix +++ b/pkgs/development/beam-modules/mix-release.nix @@ -9,16 +9,25 @@ , enableDebugInfo ? false , mixEnv ? "prod" , compileFlags ? [ ] + # mix fixed output derivation dependencies , mixFodDeps ? null + # mix dependencies generated by mix2nix # this assumes each dependency is built by buildMix or buildRebar3 # each dependency needs to have a setup hook to add the lib path to $ERL_LIBS # this is how mix will find dependencies , mixNixDeps ? { } + , elixir ? inputs.elixir , hex ? inputs.hex.override { inherit elixir; } -, stripDebug ? true + +# This reduces closure size, but can lead to some hard to understand runtime +# errors, so use with caution. See e.g. +# https://github.com/whitfin/cachex/issues/205 +# https://framagit.org/framasoft/mobilizon/-/issues/1169 +, stripDebug ? false + , ... }@attrs: let diff --git a/pkgs/servers/akkoma/default.nix b/pkgs/servers/akkoma/default.nix index 5c9ae060df78..f6fe550bca58 100644 --- a/pkgs/servers/akkoma/default.nix +++ b/pkgs/servers/akkoma/default.nix @@ -31,9 +31,6 @@ beamPackages.mixRelease rec { mix phx.digest --no-deps-check ''; - # cf. https://github.com/whitfin/cachex/issues/205 - stripDebug = false; - mixNixDeps = import ./mix.nix { inherit beamPackages lib; overrides = (final: prev: { diff --git a/pkgs/servers/pleroma/default.nix b/pkgs/servers/pleroma/default.nix index 424944f4e478..05fe4c7d31b9 100644 --- a/pkgs/servers/pleroma/default.nix +++ b/pkgs/servers/pleroma/default.nix @@ -17,7 +17,6 @@ beamPackages.mixRelease rec { rev = "v${version}"; sha256 = "sha256-3iG2s7jVEnhq1kLLgtaHnFmLYBO2Xr5M5jjZfSNA9z4="; }; - stripDebug = false; mixNixDeps = import ./mix.nix { inherit beamPackages lib; diff --git a/pkgs/servers/web-apps/plausible/default.nix b/pkgs/servers/web-apps/plausible/default.nix index d57bcfc0190a..43001649b07e 100644 --- a/pkgs/servers/web-apps/plausible/default.nix +++ b/pkgs/servers/web-apps/plausible/default.nix @@ -49,9 +49,6 @@ beamPackages.mixRelease { nativeBuildInputs = [ nodejs ]; - # https://github.com/whitfin/cachex/issues/205 - stripDebug = false; - passthru = { tests = { inherit (nixosTests) plausible; }; updateScript = ./update.sh; From 248f00541dddec8c53aaf5b98c43e9bb713ca19d Mon Sep 17 00:00:00 2001 From: Evgeny Kurnevsky Date: Tue, 16 May 2023 08:56:40 +0000 Subject: [PATCH 54/69] Revert "shadowsocks-v2ray-plugin: mark as broken" --- pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix index 2e560fe40bde..24aaebe9d02c 100644 --- a/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix +++ b/pkgs/tools/networking/shadowsocks-v2ray-plugin/default.nix @@ -23,7 +23,6 @@ buildGoModule rec { license = licenses.mit; maintainers = [ maintainers.ahrzb ]; mainProgram = "v2ray-plugin"; - broken = true; # build fails with go > 1.17 }; } From 1a78ea35ed67d33a79c338ee9771308c4a110e88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 16 May 2023 02:02:41 -0700 Subject: [PATCH 55/69] miniaudio: 0.11.14 -> 0.11.16 Diff: https://github.com/mackron/miniaudio/compare/0.11.14...0.11.16 Changelog: https://github.com/mackron/miniaudio/blob/0.11.16/CHANGES.md --- pkgs/development/libraries/miniaudio/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/miniaudio/default.nix b/pkgs/development/libraries/miniaudio/default.nix index 63a76a9752be..ba5b60b23c45 100644 --- a/pkgs/development/libraries/miniaudio/default.nix +++ b/pkgs/development/libraries/miniaudio/default.nix @@ -4,15 +4,13 @@ }: stdenv.mkDerivation rec { pname = "miniaudio"; - version = "0.11.14"; + version = "0.11.16"; src = fetchFromGitHub { owner = "mackron"; repo = "miniaudio"; - rev = "9a7663496fc06f7a9439c752fd7666ca93328c20"; - # upstream does not maintain tags: - # https://github.com/mackron/miniaudio/issues/273#issuecomment-783861269 - hash = "sha256-v/Eo4/CYcpB4tbOoy1gPqk6PUvkQIZNWrweG3l5EcMk="; + rev = version; + hash = "sha256-POe/dYPJ25RKNGIhaLoqxm9JJ08MrTyHVN4NmaGOdwM="; }; installPhase = '' From 1fffaf757db02903de3b08572dcc2bbcb2082c67 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 May 2023 09:28:08 +0000 Subject: [PATCH 56/69] cpuid: 20230406 -> 20230505 --- pkgs/os-specific/linux/cpuid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/cpuid/default.nix b/pkgs/os-specific/linux/cpuid/default.nix index 57b03ba8bdb0..381576492af4 100644 --- a/pkgs/os-specific/linux/cpuid/default.nix +++ b/pkgs/os-specific/linux/cpuid/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "cpuid"; - version = "20230406"; + version = "20230505"; src = fetchurl { url = "http://etallen.com/cpuid/${pname}-${version}.src.tar.gz"; - sha256 = "sha256-9ARd5TXzDjTowBKwVM5m9ArDmRRNbjw4lr2AwN7u8bA="; + sha256 = "sha256-VdMEAM1rq5rPNZft/JpSeiWOOntcQMzJuLMrENPimzA="; }; # For pod2man during the build process. From 743362cdded4e92f37d65ba6b0036c7a5b048d50 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 12:08:37 +0200 Subject: [PATCH 57/69] gallia: relax argcomplete constraint --- pkgs/tools/security/gallia/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/security/gallia/default.nix b/pkgs/tools/security/gallia/default.nix index 715f9fe885e0..bb62b9403cff 100644 --- a/pkgs/tools/security/gallia/default.nix +++ b/pkgs/tools/security/gallia/default.nix @@ -19,6 +19,7 @@ python3.pkgs.buildPythonApplication rec { pythonRelaxDeps = [ "aiofiles" + "argcomplete" "msgspec" ]; From aa0d00f5475b772e93265f44062c90d7a0748401 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 15 May 2023 14:57:17 -0400 Subject: [PATCH 58/69] vlang: weekly.2022.20 -> weekly.2023.19 --- pkgs/development/compilers/vlang/default.nix | 56 ++++++++++++-------- 1 file changed, 34 insertions(+), 22 deletions(-) diff --git a/pkgs/development/compilers/vlang/default.nix b/pkgs/development/compilers/vlang/default.nix index 64ccb2fc16e6..81c9f414d8e8 100644 --- a/pkgs/development/compilers/vlang/default.nix +++ b/pkgs/development/compilers/vlang/default.nix @@ -1,30 +1,31 @@ -{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx }: +{ lib, stdenv, fetchFromGitHub, glfw, freetype, openssl, makeWrapper, upx, pkgsStatic, xorg, binaryen }: -stdenv.mkDerivation rec { +let + version = "weekly.2023.19"; + # Required for bootstrap. + vc = fetchFromGitHub { + owner = "vlang"; + repo = "vc"; + rev = "f7c2b5f2a0738d0d236161c9de9f31dd0280ac86"; + sha256 = "sha256-xU3TvyNgc0o4RCsHtoC6cZTNaue2yuAiolEOvP37TKA="; + }; + # Required for vdoc. + markdown = fetchFromGitHub { + owner = "vlang"; + repo = "markdown"; + rev = "6e970bd0a7459ad7798588f1ace4aa46c5e789a2"; + hash = "sha256-hFf7c8ZNMU1j7fgmDakuO7tBVr12Wq0dgQddJnkMajE="; + }; +in +stdenv.mkDerivation { pname = "vlang"; - version = "weekly.2022.20"; + inherit version; src = fetchFromGitHub { owner = "vlang"; repo = "v"; rev = version; - sha256 = "1isbyfs98bdbm2qjf7q4bqbpsmdiqlavn3gznwr12bkvhnsf4j3x"; - }; - - # Required for bootstrap. - vc = fetchFromGitHub { - owner = "vlang"; - repo = "vc"; - rev = "167f262866090493650f58832d62d910999dd5a4"; - sha256 = "1xax8355qkrccjcmx24gcab88xnrqj15mhqy0bgp3v2rb1hw1n3a"; - }; - - # Required for vdoc. - markdown = fetchFromGitHub { - owner = "vlang"; - repo = "markdown"; - rev = "bbbd324a361e404ce0682fc00666df3a7877b398"; - sha256 = "0cawzizr3rjz81blpvxvxrcvcdai1adj66885ss390444qq1fnv7"; + sha256 = "sha256-fHn1z2q3LmSycCOa1ii4DoHvbEW4uJt3Psq3/VuZNVQ="; }; propagatedBuildInputs = [ glfw freetype openssl ] @@ -34,17 +35,28 @@ stdenv.mkDerivation rec { makeFlags = [ "local=1" - "VC=${vc}" ]; + env.VC = vc; + # libX11.dev and xorg.xorgproto are needed because of + # builder error: Header file , needed for module `clipboard.x11` was not found. Please install a package with the X11 development headers, for example: `apt-get install libx11-dev`. + # libXau, libxcb, libXdmcp need to be static if you use static gcc otherwise + # /nix/store/xnk2z26fqy86xahiz3q797dzqx96sidk-glibc-2.37-8/lib/libc.so.6: undefined reference to `_rtld_glob al_ro@GLIBC_PRIVATE' + env.VFLAGS = "-cc ${pkgsStatic.gcc}/bin/gcc -no-retry-compilation -cflags -I${xorg.libX11.dev}/include -cflags -I${xorg.xorgproto}/include -ldflags -L${binaryen}/lib -ldflags -L${pkgsStatic.xorg.libX11}/lib -ldflags -L${pkgsStatic.xorg.libxcb}/lib -ldflags -lxcb -ldflags -L${pkgsStatic.xorg.libXau}/lib -ldflags -lXau -ldflags -L${pkgsStatic.xorg.libXdmcp}/lib -ldflags -lXdmcp"; + preBuild = '' export HOME=$(mktemp -d) + mkdir -p ./thirdparty/tcc/lib + # this step is not needed it's just to silence a warning + # we don't use tcc at all since it fails on a missing libatomic + ln -s ${pkgsStatic.tinycc}/bin/tcc ./thirdparty/tcc/tcc.exe + cp -r ${pkgsStatic.boehmgc}/lib/* ./thirdparty/tcc/lib ''; # vcreate_test.v requires git, so we must remove it when building the tools. # vtest.v fails on Darwin, so let's just disable it for now. preInstall = '' - mv cmd/tools/vcreate_test.v $HOME/vcreate_test.v + mv cmd/tools/vcreate/vcreate_test.v $HOME/vcreate_test.v '' + lib.optionalString stdenv.isDarwin '' mv cmd/tools/vtest.v $HOME/vtest.v ''; From c19d8926fd680811822cafd3ae2a8e059d4253c1 Mon Sep 17 00:00:00 2001 From: happysalada Date: Mon, 15 May 2023 14:57:27 -0400 Subject: [PATCH 59/69] tinycc: fix static build --- pkgs/development/compilers/tinycc/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index ed1d7fc57a64..906df89b2117 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -75,7 +75,9 @@ stdenv.mkDerivation rec { outputs = [ "out" "info" "man" ]; - doCheck = true; + # Test segfault for static build + doCheck = !stdenv.hostPlatform.isStatic; + checkTarget = "test"; # https://www.mail-archive.com/tinycc-devel@nongnu.org/msg10142.html preCheck = lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' From 63f26166c1b6fbc364ad06a103589d69fe6a357f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Apr 2023 16:34:30 -0700 Subject: [PATCH 60/69] chatty: 0.7.0 -> 0.7.2 Changelog: https://source.puri.sm/Librem5/chatty/-/blob/v0.7.2/NEWS --- .../networking/instant-messengers/chatty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index 1c5c35248d59..5f2798a3292c 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.7.0"; + version = "0.7.2"; src = fetchFromGitLab { domain = "source.puri.sm"; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { repo = "chatty"; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-e3lYzQjQx1ndomq4mJ8TmwXoUG3Bjl9JrLuTmjXmRCs="; + hash = "sha256-H9cW19Eoz8cSv26Cyw5BIZSEWsWJktsEw92CHeecFsM="; }; postPatch = '' From 013bd5a87d933ab6642f89f022612fb2f2183143 Mon Sep 17 00:00:00 2001 From: Janik H Date: Mon, 15 May 2023 13:41:57 +0200 Subject: [PATCH 61/69] qmk_hid: init at 0.1.5 --- pkgs/tools/misc/qmk_hid/default.nix | 34 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/tools/misc/qmk_hid/default.nix diff --git a/pkgs/tools/misc/qmk_hid/default.nix b/pkgs/tools/misc/qmk_hid/default.nix new file mode 100644 index 000000000000..c8f3ae9b9195 --- /dev/null +++ b/pkgs/tools/misc/qmk_hid/default.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, pkg-config +, systemd +}: + +rustPlatform.buildRustPackage rec { + pname = "qmk_hid"; + version = "0.1.5"; + + src = fetchFromGitHub { + owner = "FrameworkComputer"; + repo = "qmk_hid"; + rev = "v${version}"; + hash = "sha256-k5D+Ph4DtdTafdNhclK3t4SmHmktuOKRlMMGMmKp48E="; + }; + + cargoHash = "sha256-+frWup9sbxCAxl2oiHAn1ccpuGkfa3kjerUByd65oSI="; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + systemd + ]; + + meta = with lib; { + description = "Commandline tool for interactng with QMK devices over HID"; + homepage = "https://github.com/FrameworkComputer/qmk_hid"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ janik ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 38d9b23d04bc..c90fd4817967 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11608,6 +11608,8 @@ with pkgs; qmk = callPackage ../tools/misc/qmk { }; + qmk_hid = callPackage ../tools/misc/qmk_hid { }; + qmarkdowntextedit = libsForQt5.callPackage ../development/libraries/qmarkdowntextedit { }; qodem = callPackage ../tools/networking/qodem { }; From 6abcef4a82db26a8a3333cef8ba61fd9a9005fe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Apr 2023 19:33:51 +0200 Subject: [PATCH 62/69] python3.pkgs.bnunicodenormalizer: init at 0.1.6 --- .../bnunicodenormalizer/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/bnunicodenormalizer/default.nix diff --git a/pkgs/development/python-modules/bnunicodenormalizer/default.nix b/pkgs/development/python-modules/bnunicodenormalizer/default.nix new file mode 100644 index 000000000000..19aa011d3782 --- /dev/null +++ b/pkgs/development/python-modules/bnunicodenormalizer/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "bnunicodenormalizer"; + version = "0.1.6"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-qVC6+0SnAs25DFzKPHFUOoYPlrRvkGWFptjIVom8wJM="; + }; + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "bnunicodenormalizer" ]; + + meta = with lib; { + description = "Bangla Unicode Normalization Toolkit"; + homepage = "https://github.com/mnansary/bnUnicodeNormalizer"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 62090b79a52f..64bfe1f4eedb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1404,6 +1404,8 @@ self: super: with self; { bme680 = callPackage ../development/python-modules/bme680 { }; + bnunicodenormalizer = callPackage ../development/python-modules/bnunicodenormalizer { }; + boa-api = callPackage ../development/python-modules/boa-api { }; bokeh = callPackage ../development/python-modules/bokeh { }; From d4730d0cd096a9b1280718853120cb25f63cfe49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Apr 2023 19:32:24 +0200 Subject: [PATCH 63/69] python3.pkgs.bangla: init at 0.0.2 --- .../python-modules/bangla/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/bangla/default.nix diff --git a/pkgs/development/python-modules/bangla/default.nix b/pkgs/development/python-modules/bangla/default.nix new file mode 100644 index 000000000000..d5664d7aeae0 --- /dev/null +++ b/pkgs/development/python-modules/bangla/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "bangla"; + version = "0.0.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-F8j9UBMhZgB31atqebdGu6cfnkk573isDZp1171xXag="; + }; + + pythonImportsCheck = [ "bangla" ]; + + # https://github.com/arsho/bangla/issues/5 + doCheck = false; + + meta = with lib; { + description = "Bangla is a package for Bangla language users with various functionalities including Bangla date and Bangla numeric conversation"; + homepage = "https://github.com/arsho/bangla"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 64bfe1f4eedb..1e56041e0054 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1185,6 +1185,8 @@ self: super: with self; { bandit = callPackage ../development/python-modules/bandit { }; + bangla = callPackage ../development/python-modules/bangla { }; + bap = callPackage ../development/python-modules/bap { inherit (pkgs.ocaml-ng.ocamlPackages) bap; }; From 7c7baa0b781b7f0871d751d2138a334182038d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Apr 2023 19:38:31 +0200 Subject: [PATCH 64/69] python3.pkgs.bnnumerizer: init at 0.0.2 --- .../python-modules/bnnumerizer/default.nix | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/python-modules/bnnumerizer/default.nix diff --git a/pkgs/development/python-modules/bnnumerizer/default.nix b/pkgs/development/python-modules/bnnumerizer/default.nix new file mode 100644 index 000000000000..c3beaa01cf12 --- /dev/null +++ b/pkgs/development/python-modules/bnnumerizer/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "bnnumerizer"; + version = "0.0.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-Qd9v0Le1GqTsR3a2ZDzt6+5f0R4zXX1W1KIMCFFeXw0="; + }; + + pythonImportsCheck = [ "bnnumerizer" ]; + + # https://github.com/mnansary/bnUnicodeNormalizer/issues/10 + doCheck = false; + + meta = with lib; { + description = "Bangla Number text to String Converter"; + homepage = "https://github.com/banglakit/number-to-bengali-word"; + license = licenses.mit; + maintainers = teams.tts.members; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1e56041e0054..151377b390f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1406,6 +1406,8 @@ self: super: with self; { bme680 = callPackage ../development/python-modules/bme680 { }; + bnnumerizer = callPackage ../development/python-modules/bnnumerizer { }; + bnunicodenormalizer = callPackage ../development/python-modules/bnunicodenormalizer { }; boa-api = callPackage ../development/python-modules/boa-api { }; From 9b34258215a73aaef5b85b0350fa6060480847f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 22 Apr 2023 18:57:48 +0200 Subject: [PATCH 65/69] tts: 0.13.2 -> 0.13.3 Diff: https://github.com/coqui-ai/TTS/compare/refs/tags/v0.13.2...v0.13.3 Changelog: https://github.com/coqui-ai/TTS/releases/tag/v0.13.3 --- pkgs/tools/audio/tts/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/audio/tts/default.nix b/pkgs/tools/audio/tts/default.nix index 687c214f6b36..24dbfee17517 100644 --- a/pkgs/tools/audio/tts/default.nix +++ b/pkgs/tools/audio/tts/default.nix @@ -1,7 +1,6 @@ { lib , python3 , fetchFromGitHub -, fetchpatch , espeak-ng , tts }: @@ -14,29 +13,19 @@ let in python.pkgs.buildPythonApplication rec { pname = "tts"; - version = "0.13.2"; + version = "0.13.3"; format = "pyproject"; src = fetchFromGitHub { owner = "coqui-ai"; repo = "TTS"; rev = "refs/tags/v${version}"; - hash = "sha256-3t4JYEwQ+puGLhGl3nn93qsL8IeOwlYtHXTrnZ5Cf+w="; + hash = "sha256-cu714/XtVqqlHN2CmUObcNFG6Vdi9VqC4at/HB8euDs="; }; - patches = [ - (fetchpatch { - # upgrade librosa to 0.10.0 - url = "https://github.com/coqui-ai/TTS/commit/4c829e74a1399ab083b566a70c1b7e879eda6e1e.patch"; - hash = "sha256-QP9AnMbdEpGJywiZBreojHUjq29ihqy6HxvUtS5OKvQ="; - excludes = [ - "requirements.txt" - ]; - }) - ]; - postPatch = let relaxedConstraints = [ + "bnunicodenormalizer" "cython" "gruut" "inflect" @@ -64,6 +53,9 @@ python.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python.pkgs; [ anyascii + bangla + bnnumerizer + bnunicodenormalizer coqpit flask fsspec From fe2c56972e8c50c635c09ccf6fa825c79d8dfb86 Mon Sep 17 00:00:00 2001 From: Sage Hane Date: Fri, 12 May 2023 21:47:22 +0200 Subject: [PATCH 66/69] mgba: add `wrapGAppsHook` --- pkgs/applications/emulators/mgba/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/emulators/mgba/default.nix b/pkgs/applications/emulators/mgba/default.nix index ebd4e5e8abaf..8537a0511286 100644 --- a/pkgs/applications/emulators/mgba/default.nix +++ b/pkgs/applications/emulators/mgba/default.nix @@ -12,6 +12,7 @@ , minizip , pkg-config , libsForQt5 +, wrapGAppsHook }: let @@ -36,9 +37,15 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ cmake pkg-config + wrapGAppsHook wrapQtAppsHook ]; + dontWrapGApps = true; + preFixup = '' + qtWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + buildInputs = [ SDL2 ffmpeg From f594db6447b0e17fd5a4adec81ada8cf2dc77f45 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Fri, 12 May 2023 15:15:09 +0200 Subject: [PATCH 67/69] mpvScripts.thumbfast: init at unstable-2023-05-12 --- .../video/mpv/scripts/thumbfast.nix | 38 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/thumbfast.nix diff --git a/pkgs/applications/video/mpv/scripts/thumbfast.nix b/pkgs/applications/video/mpv/scripts/thumbfast.nix new file mode 100644 index 000000000000..7614cc171e8c --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/thumbfast.nix @@ -0,0 +1,38 @@ +{ lib, stdenvNoCC, fetchFromGitHub, mpv-unwrapped }: + +stdenvNoCC.mkDerivation { + name = "mpv-thumbfast"; + version = "unstable-2023-05-12"; + + src = fetchFromGitHub { + owner = "po5"; + repo = "thumbfast"; + rev = "10e9f6133d4ea88e3e5d154969abfaee17173570"; + hash = "sha256-3fzkAR/itgheXQHTr30XPQR3NpYpIVeZfkcBxEoAnGg="; + }; + + postPatch = '' + substituteInPlace thumbfast.lua \ + --replace 'mpv_path = "mpv"' 'mpv_path = "${lib.getBin mpv-unwrapped}/bin/mpv"' + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/mpv/scripts + cp -r thumbfast.lua $out/share/mpv/scripts/thumbfast.lua + + runHook postInstall + ''; + + passthru.scriptName = "thumbfast.lua"; + + meta = { + description = "High-performance on-the-fly thumbnailer for mpv"; + homepage = "https://github.com/po5/thumbfast"; + license = lib.licenses.unfree; # no explicit licensing information available at this time + maintainers = with lib.maintainers; [ apfelkuchen6 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c90fd4817967..91a46491e454 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32567,6 +32567,7 @@ with pkgs; mpvacious = callPackage ../applications/video/mpv/scripts/mpvacious.nix { }; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix { }; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix { }; + thumbfast = callPackage ../applications/video/mpv/scripts/thumbfast.nix { }; thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; uosc = callPackage ../applications/video/mpv/scripts/uosc.nix { }; vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix { }; From c6c6ba285c7934fb6c32bb2e14ee605af307433e Mon Sep 17 00:00:00 2001 From: Nikita Uvarov Date: Tue, 16 May 2023 13:43:40 +0200 Subject: [PATCH 68/69] webex: use libxcrypt-legacy, add tbb (#232008) --- .../networking/instant-messengers/webex/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/webex/default.nix b/pkgs/applications/networking/instant-messengers/webex/default.nix index a01df75371c8..4487ba18985e 100644 --- a/pkgs/applications/networking/instant-messengers/webex/default.nix +++ b/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -25,7 +25,7 @@ , udev , libxcb , libxkbcommon -, libxcrypt +, libxcrypt-legacy , lshw , mesa , nspr @@ -49,6 +49,7 @@ , xcbutilrenderutil , xcbutilwm , p7zip +, tbb , wayland , libXScrnSaver }: @@ -62,6 +63,10 @@ stdenv.mkDerivation rec { sha256 = "c58a0da26c8f64302cc612c60980dbd68c074d6d8a567b3d870d7d6d06b420ad"; }; + nativeBuildInputs = [ + p7zip + ]; + buildInputs = [ alsa-lib at-spi2-atk @@ -92,7 +97,7 @@ stdenv.mkDerivation rec { udev libxcb libxkbcommon - libxcrypt + libxcrypt-legacy libX11 libXcomposite libXcursor @@ -110,7 +115,7 @@ stdenv.mkDerivation rec { xcbutilkeysyms xcbutilrenderutil xcbutilwm - p7zip + tbb wayland ]; From dfde4bc764a29a395656d7de012f21c20125bfb8 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 16 May 2023 13:50:42 +0200 Subject: [PATCH 69/69] python311Packages.patator: specify license (#232170) --- .../python-modules/patator/default.nix | 49 +++++++++++++------ 1 file changed, 33 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/patator/default.nix b/pkgs/development/python-modules/patator/default.nix index 2f0a9b9b62b7..95bbc785db92 100644 --- a/pkgs/development/python-modules/patator/default.nix +++ b/pkgs/development/python-modules/patator/default.nix @@ -1,16 +1,33 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi -, paramiko, pycurl, ajpy, impacket, pyopenssl, cx_oracle, mysqlclient -, psycopg2, pycrypto, dnspython, ipy, pysnmp, pyasn1, pysqlcipher3 }: - +{ lib +, ajpy +, buildPythonPackage +, cx_oracle +, dnspython +, fetchPypi +, impacket +, ipy +, mysqlclient +, paramiko +, psycopg2 +, pyasn1 +, pycrypto +, pycurl +, pyopenssl +, pysnmp +, pysqlcipher3 +, pythonOlder +}: buildPythonPackage rec { pname = "patator"; version = "0.9"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "68cb24bdc3042ee0d47a288b19a8b99a6c54bdbd4ddf0c5817d9b9ac0a0d8a15"; + hash = "sha256-aMskvcMELuDUeiiLGai5mmxUvb1N3wxYF9m5rAoNihU="; }; postPatch = '' @@ -19,19 +36,19 @@ buildPythonPackage rec { ''; propagatedBuildInputs = [ - paramiko - pycurl ajpy - impacket - pyopenssl cx_oracle - mysqlclient - psycopg2 - pycrypto dnspython + impacket ipy - pysnmp + mysqlclient + paramiko + psycopg2 pyasn1 + pycrypto + pycurl + pyopenssl + pysnmp pysqlcipher3 ]; @@ -39,9 +56,9 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - description = "multi-purpose brute-forcer"; + description = "Multi-purpose brute-forcer"; homepage = "https://github.com/lanjelot/patator"; - license = licenses.gpl2; + license = licenses.gpl2Only; maintainers = with maintainers; [ y0no SuperSandro2000 ]; }; }