From 01b159092f9ff80ae76fb40ee61a342729d6160e Mon Sep 17 00:00:00 2001 From: illustris Date: Sat, 15 Jun 2024 20:29:01 +0530 Subject: [PATCH 001/206] nixos/proxmox-lxc: fix ping in unprivileged LXCs --- nixos/modules/virtualisation/proxmox-lxc.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/nixos/modules/virtualisation/proxmox-lxc.nix b/nixos/modules/virtualisation/proxmox-lxc.nix index ff1c0972166c..9af02deed473 100644 --- a/nixos/modules/virtualisation/proxmox-lxc.nix +++ b/nixos/modules/virtualisation/proxmox-lxc.nix @@ -65,6 +65,14 @@ with lib; hostName = mkIf (!cfg.manageHostName) (mkForce ""); }; + # unprivileged LXCs can't set net.ipv4.ping_group_range + security.wrappers.ping = mkIf (!cfg.privileged) { + owner = "root"; + group = "root"; + capabilities = "cap_net_raw+p"; + source = "${pkgs.iputils.out}/bin/ping"; + }; + services.openssh = { enable = mkDefault true; startWhenNeeded = mkDefault true; From 335505c0e37f976d2662363a4bfc87dfe21a2922 Mon Sep 17 00:00:00 2001 From: Emily Trau Date: Thu, 11 Jul 2024 10:37:21 +1000 Subject: [PATCH 002/206] cewler: init at 1.2.0 --- pkgs/by-name/ce/cewler/package.nix | 46 ++++++++++++++++++++++++++++++ 1 file changed, 46 insertions(+) create mode 100644 pkgs/by-name/ce/cewler/package.nix diff --git a/pkgs/by-name/ce/cewler/package.nix b/pkgs/by-name/ce/cewler/package.nix new file mode 100644 index 000000000000..d0a4a2b15dea --- /dev/null +++ b/pkgs/by-name/ce/cewler/package.nix @@ -0,0 +1,46 @@ +{ lib +, python3 +, fetchFromGitHub +, gitUpdater +}: + +python3.pkgs.buildPythonApplication rec { + pname = "cewler"; + version = "1.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "roys"; + repo = "cewler"; + rev = "v${version}"; + hash = "sha256-nlF+B7Z1GRo3ZrGhG58c0vLcJAW+PvXT2tfFoyElw7w="; + }; + + nativeBuildInputs = with python3.pkgs; [ + setuptools + wheel + pythonRelaxDepsHook + ]; + + propagatedBuildInputs = with python3.pkgs; [ + pypdf + rich + scrapy + tld + twisted + ]; + + pythonRelaxDeps = true; + # Tests require network access + doCheck = false; + + passthru.updateScript = gitUpdater { rev-prefix = "v"; }; + + meta = with lib; { + description = "Custom Word List generator Redefined"; + mainProgram = "cewler"; + homepage = "https://github.com/roys/cewler"; + license = licenses.cc-by-nc-40; + maintainers = with maintainers; [ emilytrau ]; + }; +} From 42e552d2ff56453d07a827bf2701f23007cdf815 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 05:28:24 +0000 Subject: [PATCH 003/206] jmusicbot: 0.4.1 -> 0.4.2 --- pkgs/applications/audio/jmusicbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jmusicbot/default.nix b/pkgs/applications/audio/jmusicbot/default.nix index 3bf4d63eec72..a03fc7aed242 100644 --- a/pkgs/applications/audio/jmusicbot/default.nix +++ b/pkgs/applications/audio/jmusicbot/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "JMusicBot"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { url = "https://github.com/jagrosh/MusicBot/releases/download/${version}/JMusicBot-${version}.jar"; - sha256 = "sha256-+0814w4zKNr2TxZ9CS8FxeuTLa71jM+DhrfFvLMFlw0="; + sha256 = "sha256-Jg6/ju3ADBd7fc3njRzoEDVjIL4SzAzlTc02I4Q9hz4="; }; dontUnpack = true; From f1b946d0b0c185e78df5ce1c71a42934a4562795 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 05:39:00 +0000 Subject: [PATCH 004/206] gnmic: 0.37.0 -> 0.38.0 --- pkgs/applications/networking/gnmic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gnmic/default.nix b/pkgs/applications/networking/gnmic/default.nix index 4ecc4b044055..b592c1568693 100644 --- a/pkgs/applications/networking/gnmic/default.nix +++ b/pkgs/applications/networking/gnmic/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "gnmic"; - version = "0.37.0"; + version = "0.38.0"; src = fetchFromGitHub { owner = "openconfig"; repo = pname; rev = "v${version}"; - hash = "sha256-PktDdwtdCHLgLVpCRLi+Rna7dO2JeAAT6myFesIhpYc="; + hash = "sha256-sFjr43rHFnhTpOutwgt7yg5wJtpSe2+ShUggb1QVCWE="; }; - vendorHash = "sha256-gxtVvh39VqJgS5VetnLpUyKJE8DcUZgn4MA8zdD/ccU="; + vendorHash = "sha256-+TrSvGbpQSTanf5rm955WE8jj/RlZGtacbBo6JsOW4Y="; ldflags = [ "-s" "-w" From 11c2e561b6e7554892efe7aaec3aebafc7244c51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 08:52:55 +0000 Subject: [PATCH 005/206] juju: 3.5.1 -> 3.5.2 --- pkgs/applications/networking/juju/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/juju/default.nix b/pkgs/applications/networking/juju/default.nix index cce7f1e7c88f..f7339fc20601 100644 --- a/pkgs/applications/networking/juju/default.nix +++ b/pkgs/applications/networking/juju/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "juju"; - version = "3.5.1"; + version = "3.5.2"; src = fetchFromGitHub { owner = "juju"; repo = "juju"; rev = "v${version}"; - hash = "sha256-VOGkAv42dus2uxoffffIn6dwC18idwF2tycEHLd6I4s="; + hash = "sha256-HdV6bRAMQ7LynEGjrFOX36g7+1Zb9AiFtF6O4yu7+NU="; }; - vendorHash = "sha256-2JNEN8fmxflEyP5lHAv75Bjt9sbKoWL5O+87hxK89vU="; + vendorHash = "sha256-FCN+0Wx2fYQcj5CRgPubAWbGGyVQcSSfu/Om6SUB6TQ="; subPackages = [ "cmd/juju" From 9b839f69b17eaab3235ded2be774ad5f23a460d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 18:20:02 +0000 Subject: [PATCH 006/206] buildkit: 0.14.1 -> 0.15.0 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 89a1ea0e0986..846ce3297175 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - hash = "sha256-I0r9ovydRmGdg5EB+b69Iv2BuvVy82Ydz40UWmStumc="; + hash = "sha256-xJimqvNkz9od5XjpzyKCNUciw8GbfydBDl0Oa45xoME="; }; vendorHash = null; From 92d14281068c8e96dd084663c79820be76a86446 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Jul 2024 20:07:14 +0000 Subject: [PATCH 007/206] stylelint: 16.6.1 -> 16.7.0 --- pkgs/development/tools/analysis/stylelint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/stylelint/default.nix b/pkgs/development/tools/analysis/stylelint/default.nix index c2a216afea9a..ab2b971683bc 100644 --- a/pkgs/development/tools/analysis/stylelint/default.nix +++ b/pkgs/development/tools/analysis/stylelint/default.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "stylelint"; - version = "16.6.1"; + version = "16.7.0"; src = fetchFromGitHub { owner = "stylelint"; repo = "stylelint"; rev = version; - hash = "sha256-wt9EVE3AAnOVJsDHG+qIXSqZ1I2MSITHjGpEGLPWOBY="; + hash = "sha256-teoEVkSLK3pdSY6Z9aq/4/V028mLufDrPt/Ff9iO64w="; }; - npmDepsHash = "sha256-+74oklREFCDEa8E0QDBlIzfW943AStJxfXkQDqRGFyo="; + npmDepsHash = "sha256-daimn//rZhj7O/JCI2rdHn/H9o4yOYQcAL7Iu04RBlk="; dontNpmBuild = true; From 5f7fe4ccedf3b813798bc18488686176c925b82d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 05:09:02 +0000 Subject: [PATCH 008/206] python312Packages.coinmetrics-api-client: 2024.2.6.16 -> 2024.7.11.18 --- .../python-modules/coinmetrics-api-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/coinmetrics-api-client/default.nix b/pkgs/development/python-modules/coinmetrics-api-client/default.nix index fe5bf7716e40..c1a62bc2d753 100644 --- a/pkgs/development/python-modules/coinmetrics-api-client/default.nix +++ b/pkgs/development/python-modules/coinmetrics-api-client/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "coinmetrics-api-client"; - version = "2024.2.6.16"; + version = "2024.7.11.18"; pyproject = true; disabled = pythonOlder "3.9"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "coinmetrics_api_client"; - hash = "sha256-rCj8nG7iQFJKs3Mic2wRZKBqx9T0lCPH5Po8k0nLppg="; + hash = "sha256-o8SVup50hD2BzQQ3Z5wANHWEhZDOl0FH7iTmYTJnkYw="; }; pythonRelaxDeps = [ "typer" ]; From bc7c2dc70d54d1ead2ee0180c3d552e430545361 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 05:21:58 +0000 Subject: [PATCH 009/206] python312Packages.generic: 1.1.2 -> 1.1.3 --- pkgs/development/python-modules/generic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 30674f209052..c9bd2b520c3b 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "generic"; - version = "1.1.2"; + version = "1.1.3"; disabled = pythonOlder "3.7"; format = "pyproject"; src = fetchPypi { inherit pname version; - hash = "sha256-NfUvmkUIAdm+UZqmBWh0MZTViLJSkeRonPNSnVd+RbA="; + hash = "sha256-d4+CRv1uecIdS4t23cAI34s/PdIFYNQXfABuRWjzCUQ="; }; nativeBuildInputs = [ poetry-core ]; From 7a4736a620828aa53adaea58c432cf965d75c896 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 05:23:08 +0000 Subject: [PATCH 010/206] python312Packages.typeshed-client: 2.5.1 -> 2.6.0 --- pkgs/development/python-modules/typeshed-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix index 196c696ff542..e5ca8d08d733 100644 --- a/pkgs/development/python-modules/typeshed-client/default.nix +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "typeshed-client"; - version = "2.5.1"; + version = "2.6.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "JelleZijlstra"; repo = "typeshed_client"; rev = "refs/tags/v${version}"; - hash = "sha256-lITreXYn/ZOc1fF2Sqcn8UDrZAjWYfjFSEaAxqTHb4s="; + hash = "sha256-TZMCitRQlPLZyXJbPmK7SVAcGAyxWDk/y7Gzj24mgIQ="; }; build-system = [ setuptools ]; From 8435137aba4953d8e74fec00a98dc4234896fc30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 07:37:11 +0000 Subject: [PATCH 011/206] vault: 1.17.1 -> 1.17.2 --- pkgs/tools/security/vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vault/default.nix b/pkgs/tools/security/vault/default.nix index e2495db96b4c..a5f326069ae1 100644 --- a/pkgs/tools/security/vault/default.nix +++ b/pkgs/tools/security/vault/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "vault"; - version = "1.17.1"; + version = "1.17.2"; src = fetchFromGitHub { owner = "hashicorp"; repo = "vault"; rev = "v${version}"; - hash = "sha256-BpiMgLO75zImJJbFgoW6FauJIOin1oSLvm2qmKZONqY="; + hash = "sha256-R8ubsBLpjkBxJaPQokwWKtCcUW45fTkA36JnXCXHkeA="; }; - vendorHash = "sha256-gSQjd59drhG0ZkiKTNQX7NEPpv5hMRoNQqeHr5oOMAQ="; + vendorHash = "sha256-dS8DYiXXXuDJ9shK07kRUv2JnZ0eFm5YK2k470vwW/I="; proxyVendor = true; From 9835d7e5bce3c2c8b254a80327ced6e6c82007ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 08:38:26 +0000 Subject: [PATCH 012/206] python312Packages.irc: 20.4.1 -> 20.4.3 --- pkgs/development/python-modules/irc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/irc/default.nix b/pkgs/development/python-modules/irc/default.nix index b73810bf3b8a..7d6fa662f0c8 100644 --- a/pkgs/development/python-modules/irc/default.nix +++ b/pkgs/development/python-modules/irc/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "irc"; - version = "20.4.1"; + version = "20.4.3"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-J1aYebrlzYmRwhfNy0ZRkNe08YpqJnSeSNBT/QtaUsw="; + hash = "sha256-dXguOB679BBEP3kU/XTKF/vcRBTRTUjaVhSZ6wlY0AI="; }; nativeBuildInputs = [ setuptools-scm ]; From 653e50c7fd250812c2b3ac1c8ea9a5a322771cd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 08:39:48 +0000 Subject: [PATCH 013/206] ecs-agent: 1.84.0 -> 1.85.0 --- pkgs/applications/virtualization/ecs-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index ea5857768077..c8d33acd307a 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "amazon-ecs-agent"; - version = "1.84.0"; + version = "1.85.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "aws"; repo = pname; - hash = "sha256-6Les4qio+ad10b172Xw5bwU2OZiLOjZZhaoNW0MYFzk="; + hash = "sha256-IP1kZ2hSe1IJBNVYybZa+PYav3gHQayNyin3aOQCJS8="; }; vendorHash = null; From 3df1fec46e74e2af3df3bac6996a332292fb5f6c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 12:34:25 +0000 Subject: [PATCH 014/206] python312Packages.sphinxcontrib-tikz: 0.4.19 -> 0.4.20 --- .../development/python-modules/sphinxcontrib-tikz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix index 972a77858f57..f5bab742f90b 100644 --- a/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix +++ b/pkgs/development/python-modules/sphinxcontrib-tikz/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "sphinxcontrib-tikz"; - version = "0.4.19"; + version = "0.4.20"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-gen+bH4NvEbxnxr5HStisB1BqyKIS4n1VoHyAK4mXUk="; + hash = "sha256-LuO9H5yi80nAgjpPNQfZHEEOf5a+IPBR/vevFmXzQco="; }; postPatch = '' From d1ba7611538c5e1c5903132fe73ebe0b28605842 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 13:24:04 +0000 Subject: [PATCH 015/206] python312Packages.pyvmomi: 8.0.2.0.1 -> 8.0.3.0.1 --- pkgs/development/python-modules/pyvmomi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvmomi/default.nix b/pkgs/development/python-modules/pyvmomi/default.nix index c075df382106..47002d63d0b9 100644 --- a/pkgs/development/python-modules/pyvmomi/default.nix +++ b/pkgs/development/python-modules/pyvmomi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyvmomi"; - version = "8.0.2.0.1"; + version = "8.0.3.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "vmware"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Y7Zor70P4lhkAslckg/prfCmnszVMFPntWdJpfWnvIM="; + hash = "sha256-wJe45r9fWNkg8oWJZ47bcqoWzOvxpO4soV2SU4N0tb0="; }; propagatedBuildInputs = [ From d14c296d19a9b1489b50d96d997072bc1864160e Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sat, 13 Jul 2024 16:56:55 +0200 Subject: [PATCH 016/206] ubootOrangePiZero3: init --- pkgs/misc/uboot/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 8a81b47d2574..741f9ef1bc1a 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -416,6 +416,16 @@ in { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootOrangePiZero3 = buildUBoot { + defconfig = "orangepi_zero3_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + # According to https://linux-sunxi.org/H616 the H618 "is a minor update with a larger (1MB) L2 cache" (compared to the H616) + # but "does require extra support in U-Boot, TF-A and sunxi-fel. Support for that has been merged in mainline releases." + # But no extra support seems to be in TF-A. + BL31 = "${armTrustedFirmwareAllwinnerH616}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootOrangePi3 = buildUBoot { defconfig = "orangepi_3_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd0ad89cb57d..8b0aaea7195f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27746,6 +27746,7 @@ with pkgs; ubootOrangePiZeroPlus2H5 ubootOrangePiZero ubootOrangePiZero2 + ubootOrangePiZero3 ubootPcduino3Nano ubootPine64 ubootPine64LTS From 1f49800c21d2c4de6807456d5abfd5391db5c89c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 15:33:34 +0000 Subject: [PATCH 017/206] nest-cli: 10.4.0 -> 10.4.2 --- pkgs/development/tools/nest-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/nest-cli/default.nix b/pkgs/development/tools/nest-cli/default.nix index b45fe3cfb20a..656a24530265 100644 --- a/pkgs/development/tools/nest-cli/default.nix +++ b/pkgs/development/tools/nest-cli/default.nix @@ -8,16 +8,16 @@ buildNpmPackage rec { pname = "nest-cli"; - version = "10.4.0"; + version = "10.4.2"; src = fetchFromGitHub { owner = "nestjs"; repo = pname; rev = version; - hash = "sha256-0zml5gaDL7szlDob7xQOxWcSr1gwp05nhBZHlR2kM70="; + hash = "sha256-Xy4KhgDGEJGIAv7eC15nIU9ozhWUh2x8D8FnOf5jRDs="; }; - npmDepsHash = "sha256-9Eze3z2eBpE8CtKkqMXrWPyLnpSZEVZN6UmdHhOkO28="; + npmDepsHash = "sha256-dCfoX1WOhPFIXrhoErx4CJVicB11Gz378POagS5B8bE="; env = { npm_config_build_from_source = true; From a4b0afdfbdc92d8f0887d2dcf330b1bd6685b476 Mon Sep 17 00:00:00 2001 From: Florens Pauwels Date: Sun, 14 Jul 2024 00:49:09 +0200 Subject: [PATCH 018/206] openrct2: 0.4.11 -> 0.4.12 https://github.com/OpenRCT2/OpenRCT2/releases/tag/v0.4.12 Changes from OpenRCT2/OpenRCT2#21043 are now upstreamed, so the patch was removed here. --- pkgs/games/openrct2/default.nix | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 4a8a1c255e89..ac33578ca351 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchpatch , SDL2 , cmake @@ -30,11 +29,11 @@ }: let - openrct2-version = "0.4.11"; + openrct2-version = "0.4.12"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.4.4"; + objects-version = "1.4.6"; openmsx-version = "1.5"; opensfx-version = "1.0.5"; title-sequences-version = "0.4.6"; @@ -43,14 +42,14 @@ let owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - hash = "sha256-zaaVieU/hulc2G/F19diJug3xuj3ejn5ihnmKfkBDcQ="; + hash = "sha256-AZFJt1ZsYO07hHN9Nt+N95wTGfYPob/kZ7EkVVkUezg="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - hash = "sha256-wKxWp/DSKkxCEI0lp4X8F9LxQsUKZfLk2CgajQ+y84k="; + hash = "sha256-XfVic6b5jB1P2I0w5C+f97vvWvCh2zlcWpaXGLOj3CA="; }; openmsx-src = fetchFromGitHub { @@ -80,19 +79,6 @@ stdenv.mkDerivation { src = openrct2-src; - patches = [ - # https://github.com/OpenRCT2/OpenRCT2/pull/21043 - # - # Basically has broken - # OpenRCT2 - at least with older maps, as were used for testing - as stated - # in . - (fetchpatch { - name = "remove-openrct2-music.patch"; - url = "https://github.com/OpenRCT2/OpenRCT2/commit/9ea13848be0b974336c34e6eb119c49ba42a907c.patch"; - hash = "sha256-2PPRqUZf4+ys89mdzp5nvdtdv00V9Vzj3v/95rmlf1c="; - }) - ]; - nativeBuildInputs = [ cmake pkg-config From 943b886f6118ab1e58db60cd63626874ff71ceb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Jul 2024 23:22:33 +0000 Subject: [PATCH 019/206] fheroes2: 1.1.0 -> 1.1.1 --- pkgs/games/fheroes2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/fheroes2/default.nix b/pkgs/games/fheroes2/default.nix index 0508fda01093..0d6ba0b24eb8 100644 --- a/pkgs/games/fheroes2/default.nix +++ b/pkgs/games/fheroes2/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "fheroes2"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "ihhub"; repo = "fheroes2"; rev = version; - hash = "sha256-a4IZX0aq2iXLPKTVRWxkr50vhCEqAMUA0z50rOpEIjU="; + hash = "sha256-RzMSHcyDsdZYTJYU53DjoCrCpy5gjgrtZb8NuP5trPk="; }; nativeBuildInputs = [ imagemagick ]; From b283cb4ce8db43d7e7ec907617faa5745f686e93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:17:01 +0000 Subject: [PATCH 020/206] libpointmatcher: 1.4.2 -> 1.4.3 --- pkgs/development/libraries/libpointmatcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libpointmatcher/default.nix b/pkgs/development/libraries/libpointmatcher/default.nix index 709ca6876048..57c629783aa6 100644 --- a/pkgs/development/libraries/libpointmatcher/default.nix +++ b/pkgs/development/libraries/libpointmatcher/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpointmatcher"; - version = "1.4.2"; + version = "1.4.3"; src = fetchFromGitHub { owner = "norlab-ulaval"; repo = "libpointmatcher"; rev = version; - hash = "sha256-XXkvBxG9f8rW1O968+2R+gltMSRGqH225vOmzp6Tpb8="; + hash = "sha256-ewsU3aCFPeem1pJpqKaceMhL7SwTYOaYlcwOfMxwkSs="; }; nativeBuildInputs = [ cmake ]; From 949e81ade255f06cf4011323ffb40411b7de00e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 01:17:28 +0000 Subject: [PATCH 021/206] legit-web: 0.2.2 -> 0.2.3 --- pkgs/applications/version-management/legit-web/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/legit-web/default.nix b/pkgs/applications/version-management/legit-web/default.nix index 3c42284702d2..af340bd22eaf 100644 --- a/pkgs/applications/version-management/legit-web/default.nix +++ b/pkgs/applications/version-management/legit-web/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "legit"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitHub { repo = "legit"; owner = "icyphox"; rev = "v${version}"; - hash = "sha256-TBq1ILBhojMIxnLj108L0zLmFsZD/ET9w5cSbqk8+XM="; + hash = "sha256-C6PzZFYGjQs1BbYuEwcTpLQ3bNVb1rXTd0zXosF1kaE="; }; - vendorHash = "sha256-IeWgmUNkBU3W6ayfRkzMO/0XHNqm5zy5lLUNePzv+ug="; + vendorHash = "sha256-G4Wij0UCiXyVtb+66yU3FY2WbpPfqo0SA7OOcywnKU0="; postInstall = '' mkdir -p $out/lib/legit/templates From 5ccae8130ec131d89a3412fd1aeff34fa6a87b32 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 02:36:43 +0000 Subject: [PATCH 022/206] python312Packages.whatthepatch: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/whatthepatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/whatthepatch/default.nix b/pkgs/development/python-modules/whatthepatch/default.nix index 1db5e385768c..c4ad9ca8d0ec 100644 --- a/pkgs/development/python-modules/whatthepatch/default.nix +++ b/pkgs/development/python-modules/whatthepatch/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "whatthepatch"; - version = "1.0.5"; + version = "1.0.6"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cscorley"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-1+OIs77Vyx56pgf7VSmi4UsPgkv8qZXFm8L2jK2CTMk="; + hash = "sha256-NjlQL+zgN9WKUMxMCl97eXTdM8Prrg3iiY8/zwQ8jyY="; }; nativeBuildInputs = [ setuptools ]; From d13af34577e9913b63db821514fe387c360b2d59 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 03:05:57 +0000 Subject: [PATCH 023/206] yaws: 2.1.1 -> 2.2.0 --- pkgs/servers/http/yaws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/yaws/default.nix b/pkgs/servers/http/yaws/default.nix index ad096299c44f..25c8a283e759 100644 --- a/pkgs/servers/http/yaws/default.nix +++ b/pkgs/servers/http/yaws/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "yaws"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "erlyaws"; repo = pname; rev = "${pname}-${version}"; - hash = "sha256-F1qhq0SEChWw/EBodXKWTqMNmGoTwP2JgkmfANUFD9I="; + hash = "sha256-acO8Vc8sZJl22HUml2kTxVswLEirqMbqHQdRIbkkcvs="; }; configureFlags = [ "--with-extrainclude=${pam}/include/security" ]; From 51b887167e17039e2ec49943db2efd111cd0710c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 03:43:22 +0000 Subject: [PATCH 024/206] igir: 2.9.0 -> 2.9.2 --- pkgs/by-name/ig/igir/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ig/igir/package.nix b/pkgs/by-name/ig/igir/package.nix index dd635d356c06..9e301ddb259d 100644 --- a/pkgs/by-name/ig/igir/package.nix +++ b/pkgs/by-name/ig/igir/package.nix @@ -10,16 +10,16 @@ buildNpmPackage rec { pname = "igir"; - version = "2.9.0"; + version = "2.9.2"; src = fetchFromGitHub { owner = "emmercm"; repo = "igir"; rev = "v${version}"; - hash = "sha256-AdoY1STLldud9agh6j68CkCeZ2F0OYuu5cEpCTyPCGs="; + hash = "sha256-3lEU3uK/Wp09TOhVJVNslOCx9vTVp0gBTbkQXB13i9Y="; }; - npmDepsHash = "sha256-6V5ROCJF2msd0rt6GFXYAhkFtjSEquteCQMscPR8XIw="; + npmDepsHash = "sha256-gJvJwostQgEq14zDmMOatfWmkEYNAqGCL9MJPrv5kwk="; # I have no clue why I have to do this postPatch = '' From e9382cc356109d52cd9b33839e5f3f1d6d43524b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 05:36:26 +0000 Subject: [PATCH 025/206] python312Packages.django-ninja: 1.1.0 -> 1.2.1 --- pkgs/development/python-modules/django-ninja/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django-ninja/default.nix b/pkgs/development/python-modules/django-ninja/default.nix index cc6d7ce15388..b94438b983ec 100644 --- a/pkgs/development/python-modules/django-ninja/default.nix +++ b/pkgs/development/python-modules/django-ninja/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "django-ninja"; - version = "1.1.0"; + version = "1.2.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vitalik"; repo = "django-ninja"; rev = "refs/tags/v${version}"; - hash = "sha256-pvpYDuUZi0Gr5RbBWc91LzgmRLhihrhsKaD/AWN5+Bo="; + hash = "sha256-43yLhiDpksTPNh9Q8T8rSBzaZ99XCXIrNkTSdWk0gLc="; }; propagatedBuildInputs = [ From 5a894486fbf7fe370f950353ebd4b05b29395787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Jul 2024 06:08:26 +0000 Subject: [PATCH 026/206] python312Packages.packageurl-python: 0.15.1 -> 0.15.3 --- pkgs/development/python-modules/packageurl-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/packageurl-python/default.nix b/pkgs/development/python-modules/packageurl-python/default.nix index 8ce0a1ed4020..8a4c0ac1061b 100644 --- a/pkgs/development/python-modules/packageurl-python/default.nix +++ b/pkgs/development/python-modules/packageurl-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "packageurl-python"; - version = "0.15.1"; + version = "0.15.3"; pyproject = true; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "packageurl_python"; inherit version; - hash = "sha256-mje5p8rZoocrRhIVG6N0n9neyQSFV3wU03S25mt+3wM="; + hash = "sha256-guEVDx/CKOJeezvhxkHvlraggRUmwLTk94gqGB6GJgc="; }; build-system = [ setuptools ]; From d7978826fdd6c81fdb188ffff48618e5f40ad6f5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jul 2024 16:14:13 +0200 Subject: [PATCH 027/206] python312Packages.google-generativeai: 0.7.1 -> 0.7.2 Diff: https://github.com/google/generative-ai-python/compare/refs/tags/v0.7.1...v0.7.2 Changelog: https://github.com/google/generative-ai-python/releases/tag/v0.7.2 --- .../python-modules/google-generativeai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-generativeai/default.nix b/pkgs/development/python-modules/google-generativeai/default.nix index 69882392bb98..ae1bdc82ae7f 100644 --- a/pkgs/development/python-modules/google-generativeai/default.nix +++ b/pkgs/development/python-modules/google-generativeai/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-generativeai"; - version = "0.7.1"; + version = "0.7.2"; pyproject = true; disabled = pythonOlder "3.9"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "google"; repo = "generative-ai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-4pfcZIRPxkZkKjzYtOn3r7mn0pJZeUzkYidZmePgDys="; + hash = "sha256-KVKoPCpMaaVMU6VqYXD7vHmhv1AS5slRobRVDDuaDHc="; }; pythonRelaxDeps = [ "google-ai-generativelanguage" ]; From 82fbceb1fa6c188346f0649bb89c105d2d123162 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Jul 2024 16:15:26 +0200 Subject: [PATCH 028/206] python312Packages.google-cloud-workflows: 1.14.3 -> 1.14.4 Changelog: https://github.com/googleapis/google-cloud-python/blob/google-cloud-workflows-v1.14.4/packages/google-cloud-workflows/CHANGELOG.md --- .../python-modules/google-cloud-workflows/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-workflows/default.nix b/pkgs/development/python-modules/google-cloud-workflows/default.nix index 95bf8d056e25..8b213a1e36c9 100644 --- a/pkgs/development/python-modules/google-cloud-workflows/default.nix +++ b/pkgs/development/python-modules/google-cloud-workflows/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-workflows"; - version = "1.14.3"; + version = "1.14.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IUC5f3gDe5Z9QYVXaIZ3L+F7530q6ZltIHozTtWnf/4="; + hash = "sha256-qylBTJ2yAJGZt+xv9hRyYvP4zlTibhIIHVJF9J67d9c="; }; nativeBuildInputs = [ setuptools ]; From af3f6ca5ff30df83fabd71674b460a8420d468d1 Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 9 Jul 2024 20:40:54 +0800 Subject: [PATCH 029/206] pjsip: format --- .../applications/networking/pjsip/default.nix | 151 +++++++++--------- 1 file changed, 78 insertions(+), 73 deletions(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index fe0e032dd224..69e874d89545 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -1,17 +1,18 @@ -{ lib -, testers -, stdenv -, fetchFromGitHub -, openssl -, libsamplerate -, swig -, alsa-lib -, AppKit -, CoreFoundation -, Security -, python3 -, pythonSupport ? true -, runCommand +{ + lib, + testers, + stdenv, + fetchFromGitHub, + openssl, + libsamplerate, + swig, + alsa-lib, + AppKit, + CoreFoundation, + Security, + python3, + pythonSupport ? true, + runCommand, }: stdenv.mkDerivation (finalAttrs: { pname = "pjsip"; @@ -24,22 +25,28 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-LDA3o1QMrAxcGuOi/YRoMzXmw/wFkfDs2wweZuIJ2RY="; }; - patches = [ - ./fix-aarch64.patch + patches = [ ./fix-aarch64.patch ]; + + nativeBuildInputs = lib.optionals pythonSupport [ + swig + python3 ]; - nativeBuildInputs = - lib.optionals pythonSupport [ swig python3 ]; - - buildInputs = [ openssl libsamplerate ] + buildInputs = + [ + openssl + libsamplerate + ] ++ lib.optional stdenv.isLinux alsa-lib - ++ lib.optionals stdenv.isDarwin [ AppKit CoreFoundation Security ]; + ++ lib.optionals stdenv.isDarwin [ + AppKit + CoreFoundation + Security + ]; - env = lib.optionalAttrs stdenv.cc.isClang { - CXXFLAGS = "-std=c++11"; - } // lib.optionalAttrs stdenv.isDarwin { - NIX_CFLAGS_LINK = "-headerpad_max_install_names"; - }; + env = + lib.optionalAttrs stdenv.cc.isClang { CXXFLAGS = "-std=c++11"; } + // lib.optionalAttrs stdenv.isDarwin { NIX_CFLAGS_LINK = "-headerpad_max_install_names"; }; preConfigure = '' export LD=$CC @@ -51,52 +58,54 @@ stdenv.mkDerivation (finalAttrs: { configureFlags = [ "--enable-shared" ]; - outputs = [ "out" ] - ++ lib.optional pythonSupport "py"; + outputs = [ "out" ] ++ lib.optional pythonSupport "py"; - postInstall = '' - mkdir -p $out/bin - cp pjsip-apps/bin/pjsua-* $out/bin/pjsua - mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples - cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples - '' + lib.optionalString pythonSupport '' - (cd pjsip-apps/src/swig/python && \ - python setup.py install --prefix=$py - ) - '' + lib.optionalString stdenv.isDarwin '' - # On MacOS relative paths are used to refer to libraries. All libraries use - # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to - # rewrite these to use absolute ones. + postInstall = + '' + mkdir -p $out/bin + cp pjsip-apps/bin/pjsua-* $out/bin/pjsua + mkdir -p $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples + cp pjsip-apps/bin/samples/*/* $out/share/${finalAttrs.pname}-${finalAttrs.version}/samples + '' + + lib.optionalString pythonSupport '' + (cd pjsip-apps/src/swig/python && \ + python setup.py install --prefix=$py + ) + '' + + lib.optionalString stdenv.isDarwin '' + # On MacOS relative paths are used to refer to libraries. All libraries use + # a relative path like ../lib/*.dylib or ../../lib/*.dylib. We need to + # rewrite these to use absolute ones. - # First, find all libraries (and their symlinks) in our outputs to define - # the install_name_tool -change arguments we should pass. - readarray -t libraries < <( - for outputName in $(getAllOutputNames); do - find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \) + # First, find all libraries (and their symlinks) in our outputs to define + # the install_name_tool -change arguments we should pass. + readarray -t libraries < <( + for outputName in $(getAllOutputNames); do + find "''${!outputName}" \( -name '*.dylib*' -o -name '*.so*' \) + done + ) + + # Determine the install_name_tool -change arguments that are going to be + # applied to all libraries. + change_args=() + for lib in "''${libraries[@]}"; do + lib_name="$(basename $lib)" + change_args+=(-change ../lib/$lib_name $lib) + change_args+=(-change ../../lib/$lib_name $lib) done - ) - # Determine the install_name_tool -change arguments that are going to be - # applied to all libraries. - change_args=() - for lib in "''${libraries[@]}"; do - lib_name="$(basename $lib)" - change_args+=(-change ../lib/$lib_name $lib) - change_args+=(-change ../../lib/$lib_name $lib) - done + # Rewrite id and library refences for all non-symlinked libraries. + for lib in "''${libraries[@]}"; do + if [ -f "$lib" ]; then + install_name_tool -id $lib "''${change_args[@]}" $lib + fi + done - # Rewrite id and library refences for all non-symlinked libraries. - for lib in "''${libraries[@]}"; do - if [ -f "$lib" ]; then - install_name_tool -id $lib "''${change_args[@]}" $lib - fi - done - - # Rewrite library references for all executables. - find "$out" -executable -type f | while read executable; do - install_name_tool "''${change_args[@]}" "$executable" - done - ''; + # Rewrite library references for all executables. + find "$out" -executable -type f | while read executable; do + install_name_tool "''${change_args[@]}" "$executable" + done + ''; # We need the libgcc_s.so.1 loadable (for pthread_cancel to work) dontPatchELF = true; @@ -106,9 +115,7 @@ stdenv.mkDerivation (finalAttrs: { command = "pjsua --version"; }; - passthru.tests.pkg-config = testers.hasPkgConfigModules { - package = finalAttrs.finalPackage; - }; + passthru.tests.pkg-config = testers.hasPkgConfigModules { package = finalAttrs.finalPackage; }; passthru.tests.python-pjsua2 = runCommand "python-pjsua2" { } '' ${(python3.withPackages (pkgs: [ pkgs.pjsua2 ])).interpreter} -c "import pjsua2" > $out @@ -121,8 +128,6 @@ stdenv.mkDerivation (finalAttrs: { maintainers = with maintainers; [ olynch ]; mainProgram = "pjsua"; platforms = platforms.linux ++ platforms.darwin; - pkgConfigModules = [ - "libpjproject" - ]; + pkgConfigModules = [ "libpjproject" ]; }; }) From 8a2af2b57e658b575b7c68b1611337277a060cba Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 9 Jul 2024 20:41:13 +0800 Subject: [PATCH 030/206] pjsip: fix build on python 3.12 --- pkgs/applications/networking/pjsip/default.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/pjsip/default.nix b/pkgs/applications/networking/pjsip/default.nix index 69e874d89545..b267dee36909 100644 --- a/pkgs/applications/networking/pjsip/default.nix +++ b/pkgs/applications/networking/pjsip/default.nix @@ -27,9 +27,22 @@ stdenv.mkDerivation (finalAttrs: { patches = [ ./fix-aarch64.patch ]; + postPatch = '' + substituteInPlace \ + pjsip-apps/src/py_pjsua/setup.py \ + pjsip-apps/src/swig/python/setup.py \ + pjsip-apps/src/python/setup.py \ + pjsip-apps/src/python/setup-vc.py \ + --replace-fail "distutils.core" "setuptools" + ''; + nativeBuildInputs = lib.optionals pythonSupport [ swig python3 + python3.pkgs.build + python3.pkgs.installer + python3.pkgs.setuptools + python3.pkgs.wheel ]; buildInputs = @@ -69,7 +82,8 @@ stdenv.mkDerivation (finalAttrs: { '' + lib.optionalString pythonSupport '' (cd pjsip-apps/src/swig/python && \ - python setup.py install --prefix=$py + python -m build --no-isolation --outdir dist/ --wheel + python -m installer --prefix $py dist/*.whl ) '' + lib.optionalString stdenv.isDarwin '' From 0e6664a30cd217c9c0ad08fd9088efa06a2bb999 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Sun, 14 Jul 2024 22:54:44 +0200 Subject: [PATCH 031/206] clever-tools: fix cleanup for cross compilation --- pkgs/by-name/cl/clever-tools/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/cl/clever-tools/package.nix b/pkgs/by-name/cl/clever-tools/package.nix index b1dcca9abf2d..2a0a368d28f7 100644 --- a/pkgs/by-name/cl/clever-tools/package.nix +++ b/pkgs/by-name/cl/clever-tools/package.nix @@ -30,6 +30,7 @@ buildNpmPackage rec { installShellCompletion --cmd clever \ --bash <($out/bin/clever --bash-autocomplete-script $out/bin/clever) \ --zsh <($out/bin/clever --zsh-autocomplete-script $out/bin/clever) + '' + '' rm $out/bin/install-clever-completion rm $out/bin/uninstall-clever-completion ''; From 91edc515baabce99abed39eadc7afe78df78d6b9 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 16:05:39 -0400 Subject: [PATCH 032/206] adafruit-nrfutil: remove nose and modernize --- pkgs/by-name/ad/adafruit-nrfutil/package.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/ad/adafruit-nrfutil/package.nix b/pkgs/by-name/ad/adafruit-nrfutil/package.nix index 6b300331f622..fda8682a8ca6 100644 --- a/pkgs/by-name/ad/adafruit-nrfutil/package.nix +++ b/pkgs/by-name/ad/adafruit-nrfutil/package.nix @@ -32,11 +32,9 @@ python3Packages.buildPythonApplication rec { }) ]; - nativeBuildInputs = with python3Packages; [ - setuptools - ]; + build-system = [ python3Packages.setuptools ]; - propagatedBuildInputs = with python3Packages; [ + dependencies = with python3Packages; [ click ecdsa pyserial @@ -44,7 +42,6 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = with python3Packages; [ behave - nose pytestCheckHook ]; @@ -56,11 +53,12 @@ python3Packages.buildPythonApplication rec { "nordicsemi" ]; - meta = with lib; { + meta = { homepage = "https://github.com/adafruit/Adafruit_nRF52_nrfutil"; description = "Modified version of Nordic's nrfutil 0.5.x for use with the Adafruit Feather nRF52"; mainProgram = "adafruit-nrfutil"; - license = licenses.bsd3; - maintainers = with maintainers; [ stargate01 ]; + # https://github.com/adafruit/Adafruit_nRF52_nrfutil/issues/41 + license = lib.licenses.unfreeRedistributable; + maintainers = with lib.maintainers; [ stargate01 ]; }; } From 0702caaa2e1abbcd1747d4ebeb961a4fc0b476b4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jul 2024 15:08:03 +0200 Subject: [PATCH 033/206] mysql80: 8.0.37 -> 8.0.38 --- pkgs/servers/sql/mysql/8.0.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mysql/8.0.x.nix b/pkgs/servers/sql/mysql/8.0.x.nix index 6de05cba60f3..20bf870af5ea 100644 --- a/pkgs/servers/sql/mysql/8.0.x.nix +++ b/pkgs/servers/sql/mysql/8.0.x.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mysql"; - version = "8.0.37"; + version = "8.0.38"; src = fetchurl { url = "https://dev.mysql.com/get/Downloads/MySQL-${lib.versions.majorMinor finalAttrs.version}/mysql-${finalAttrs.version}.tar.gz"; - hash = "sha256-4GOgkazZ7EC7BfLATfZPiZan5OJuiDu2UChJ1fa0pho="; + hash = "sha256-0qXCL4tWLX4PEdm441yYeaUWYDlCTBNCclN9Ao1yGRQ="; }; nativeBuildInputs = [ bison cmake pkg-config ] From 84f5e5c688681d7770d181e9c3f0a73f852798d8 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:32:35 -0400 Subject: [PATCH 034/206] rav1e: add updateScript --- pkgs/by-name/ra/rav1e/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/ra/rav1e/package.nix b/pkgs/by-name/ra/rav1e/package.nix index b90dd2d56a61..2a0ad2ab37fd 100644 --- a/pkgs/by-name/ra/rav1e/package.nix +++ b/pkgs/by-name/ra/rav1e/package.nix @@ -10,6 +10,7 @@ libgit2, libiconv, nasm, + nix-update-script, testers, zlib, rav1e, @@ -59,6 +60,7 @@ rustPlatform.buildRustPackage rec { passthru = { tests.version = testers.testVersion { package = rav1e; }; + updateScript = nix-update-script { }; }; meta = { From 89b002b7962a3757a67a95016050328975fbfe1d Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:47:55 -0400 Subject: [PATCH 035/206] ntpd-rs: pin apple_sdk version in expression --- pkgs/tools/networking/ntpd-rs/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/tools/networking/ntpd-rs/default.nix index 6d1353a4e905..f2e0a8299ec3 100644 --- a/pkgs/tools/networking/ntpd-rs/default.nix +++ b/pkgs/tools/networking/ntpd-rs/default.nix @@ -5,8 +5,8 @@ fetchFromGitHub, ntpd-rs, installShellFiles, + darwin, pandoc, - Security, nixosTests, testers, }: @@ -24,7 +24,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY="; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; nativeBuildInputs = [ pandoc installShellFiles diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b35e4a69c67..9b5f247583ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1940,9 +1940,7 @@ with pkgs; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; - ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { - inherit (darwin.apple_sdk_11_0.frameworks) Security; - }; + ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { }; ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; From 263f99457e67a803f68b41d308f927ac989008ec Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:49:41 -0400 Subject: [PATCH 036/206] ntpd-rs: migrate to by-name --- .../ntpd-rs/default.nix => by-name/nt/ntpd-rs/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{tools/networking/ntpd-rs/default.nix => by-name/nt/ntpd-rs/package.nix} (100%) diff --git a/pkgs/tools/networking/ntpd-rs/default.nix b/pkgs/by-name/nt/ntpd-rs/package.nix similarity index 100% rename from pkgs/tools/networking/ntpd-rs/default.nix rename to pkgs/by-name/nt/ntpd-rs/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b5f247583ca..ef954c6df164 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1940,8 +1940,6 @@ with pkgs; npm-check-updates = callPackage ../tools/package-management/npm-check-updates { }; - ntpd-rs = darwin.apple_sdk_11_0.callPackage ../tools/networking/ntpd-rs { }; - ocs-url = libsForQt5.callPackage ../tools/misc/ocs-url { }; openbugs = pkgsi686Linux.callPackage ../applications/science/machine-learning/openbugs { }; From 94743533ea90dbb2abf9bf0c7691538125801d89 Mon Sep 17 00:00:00 2001 From: seth Date: Mon, 15 Jul 2024 13:51:16 -0400 Subject: [PATCH 037/206] ntpd-rs: add updateScript --- pkgs/by-name/nt/ntpd-rs/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index f2e0a8299ec3..780eb2c0877d 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -8,6 +8,7 @@ darwin, pandoc, nixosTests, + nix-update-script, testers, }: @@ -62,6 +63,8 @@ rustPlatform.buildRustPackage rec { inherit version; }; }; + + updateScript = nix-update-script { }; }; meta = { From d7f544894417f9226b8bab65b9e43b785b9b864a Mon Sep 17 00:00:00 2001 From: Luflosi Date: Mon, 15 Jul 2024 22:44:49 +0200 Subject: [PATCH 038/206] linuxPackages.apfs: 0.3.9 -> 0.3.10 https://github.com/linux-apfs/linux-apfs-rw/releases/tag/v0.3.10 --- pkgs/os-specific/linux/apfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/apfs/default.nix b/pkgs/os-specific/linux/apfs/default.nix index 8d34d57d4f24..22d69959e21f 100644 --- a/pkgs/os-specific/linux/apfs/default.nix +++ b/pkgs/os-specific/linux/apfs/default.nix @@ -6,7 +6,7 @@ }: let - tag = "0.3.9"; + tag = "0.3.10"; in stdenv.mkDerivation { pname = "apfs"; @@ -16,7 +16,7 @@ stdenv.mkDerivation { owner = "linux-apfs"; repo = "linux-apfs-rw"; rev = "v${tag}"; - hash = "sha256-KZ/B3sR9x58DTUeHUI0ZPW6bb7vFkPMVXaEZ25m3cP0="; + hash = "sha256-GFqBRZMoBBRRrWAhRKJrxawPS4z+xVkuHSlCoSrMEEI="; }; hardeningDisable = [ "pic" ]; From d19ca7e4a0bab38c5a422b845739e028a43f75f7 Mon Sep 17 00:00:00 2001 From: Jeremy Baxter Date: Tue, 16 Jul 2024 14:56:38 +1200 Subject: [PATCH 039/206] aerc: 0.18.0 -> 0.18.1 --- pkgs/by-name/ae/aerc/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ae/aerc/package.nix b/pkgs/by-name/ae/aerc/package.nix index 8392c7590cf4..a36b27afe661 100644 --- a/pkgs/by-name/ae/aerc/package.nix +++ b/pkgs/by-name/ae/aerc/package.nix @@ -12,17 +12,17 @@ buildGoModule rec { pname = "aerc"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromSourcehut { owner = "~rjarry"; repo = "aerc"; rev = version; - hash = "sha256-azIgf9kv4Pg8BW1j56D2Ta1DIQNHC9Mql3tebp+MLSY="; + hash = "sha256-yyVK87EIoW0Chz9xUOtoKHKIQUs2QDKtpsApvDuqSL4="; }; proxyVendor = true; - vendorHash = "sha256-BQ36LJFo9bQNQdwb/vygksk3ih/tVaMwfWT1f31bsbY="; + vendorHash = "sha256-kOBkwkFv86lbK/J0NGTgZadL26kvqmGLeWVYm+ie1HQ="; nativeBuildInputs = [ scdoc From 7a8a2eead7072ad66fb203eac21cb9d8d86ac110 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Tue, 16 Jul 2024 21:52:06 +0200 Subject: [PATCH 040/206] graylog: refactor hash attribute rel: https://github.com/NixOS/nixpkgs/pull/310349/files#r1597704399 --- pkgs/tools/misc/graylog/5.1.nix | 2 +- pkgs/tools/misc/graylog/5.2.nix | 2 +- pkgs/tools/misc/graylog/6.0.nix | 2 +- pkgs/tools/misc/graylog/graylog.nix | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/graylog/5.1.nix b/pkgs/tools/misc/graylog/5.1.nix index 3aa1b06744c8..859fab5755ad 100644 --- a/pkgs/tools/misc/graylog/5.1.nix +++ b/pkgs/tools/misc/graylog/5.1.nix @@ -3,7 +3,7 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { version = "5.1.13"; - sha256 = "sha256-qjNJ51EbPjtDR5h4DElpSblj/c8WarXxPfcLTuTx5AQ="; + hash = "sha256-qjNJ51EbPjtDR5h4DElpSblj/c8WarXxPfcLTuTx5AQ="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } diff --git a/pkgs/tools/misc/graylog/5.2.nix b/pkgs/tools/misc/graylog/5.2.nix index 1247214e9753..e70ac7c4663e 100644 --- a/pkgs/tools/misc/graylog/5.2.nix +++ b/pkgs/tools/misc/graylog/5.2.nix @@ -3,7 +3,7 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { version = "5.2.7"; - sha256 = "sha256-so9IHX0r3dmj5wLrLtQgrcXk+hu6E8/1d7wJu1XDcVA="; + hash = "sha256-so9IHX0r3dmj5wLrLtQgrcXk+hu6E8/1d7wJu1XDcVA="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } diff --git a/pkgs/tools/misc/graylog/6.0.nix b/pkgs/tools/misc/graylog/6.0.nix index ea8d2cddeb4f..eab48ab27be8 100644 --- a/pkgs/tools/misc/graylog/6.0.nix +++ b/pkgs/tools/misc/graylog/6.0.nix @@ -3,7 +3,7 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { version = "6.0.4"; - sha256 = "sha256-PU7AepIRwx7FibBkZaQUWUy3v2MeM7cS77FH28aj8I8="; + hash = "sha256-PU7AepIRwx7FibBkZaQUWUy3v2MeM7cS77FH28aj8I8="; maintainers = with lib.maintainers; [ bbenno ]; license = lib.licenses.sspl; } diff --git a/pkgs/tools/misc/graylog/graylog.nix b/pkgs/tools/misc/graylog/graylog.nix index 4608d6fa3f57..d8881cb00fe4 100644 --- a/pkgs/tools/misc/graylog/graylog.nix +++ b/pkgs/tools/misc/graylog/graylog.nix @@ -1,13 +1,13 @@ { lib, stdenv, fetchurl, makeWrapper, openjdk11_headless, openjdk17_headless, systemd, nixosTests}: -{ version, sha256, maintainers, license }: +{ version, hash, maintainers, license }: stdenv.mkDerivation rec { pname = "graylog_${lib.versions.majorMinor version}"; inherit version; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - inherit sha256; + inherit hash; }; dontBuild = true; From aabff57ea6ccd808bc4257cbe70adaa9ed3b4641 Mon Sep 17 00:00:00 2001 From: Benno Bielmeier Date: Tue, 16 Jul 2024 21:53:43 +0200 Subject: [PATCH 041/206] graylog-5_2: 5.2.7 -> 5.2.9 --- pkgs/tools/misc/graylog/5.2.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/graylog/5.2.nix b/pkgs/tools/misc/graylog/5.2.nix index e70ac7c4663e..09533496d59f 100644 --- a/pkgs/tools/misc/graylog/5.2.nix +++ b/pkgs/tools/misc/graylog/5.2.nix @@ -2,8 +2,8 @@ let buildGraylog = callPackage ./graylog.nix {}; in buildGraylog { - version = "5.2.7"; - hash = "sha256-so9IHX0r3dmj5wLrLtQgrcXk+hu6E8/1d7wJu1XDcVA="; + version = "5.2.9"; + hash = "sha256-xvKFHAWUb1cqARWH57AOEdRzj5W7n0AgIUkEOBuRumo="; maintainers = [ lib.maintainers.f2k1de ]; license = lib.licenses.sspl; } From 2e1df33520b9321c11a79c946c4b48bece8b0e3e Mon Sep 17 00:00:00 2001 From: Niko Strijbol Date: Tue, 16 Jul 2024 22:02:04 +0200 Subject: [PATCH 042/206] gramps: 5.2.2 -> 5.2.3 --- pkgs/applications/misc/gramps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gramps/default.nix b/pkgs/applications/misc/gramps/default.nix index 5ecab79226c8..ba5bce3a0edb 100644 --- a/pkgs/applications/misc/gramps/default.nix +++ b/pkgs/applications/misc/gramps/default.nix @@ -23,7 +23,7 @@ let inherit (pythonPackages) buildPythonApplication pythonOlder; in buildPythonApplication rec { - version = "5.2.2"; + version = "5.2.3"; pname = "gramps"; pyproject = true; @@ -33,7 +33,7 @@ buildPythonApplication rec { owner = "gramps-project"; repo = "gramps"; rev = "refs/tags/v${version}"; - hash = "sha256-umyc5G4p0GSEQEtq6sPUgtq1waNL1OW7iLxnf5dGcLc="; + hash = "sha256-DfKKB+rgMGQ8HTqhCp11UTYLj3Fdd0B0v4a922GJ8L8="; }; patches = [ From 59f0dffeefa13f1e0b11242f8c9e69a0d7cabd8c Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Tue, 16 Jul 2024 17:14:31 -0400 Subject: [PATCH 043/206] python311Packages.openai: 1.35.13 -> 1.35.14 Diff: https://github.com/openai/openai-python/compare/refs/tags/v1.35.13...v1.35.14 Changelog: https://github.com/openai/openai-python/releases/tag/v1.35.14 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 8e9eeb912d93..77ae8d099276 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "openai"; - version = "1.35.13"; + version = "1.35.14"; pyproject = true; disabled = pythonOlder "3.7.1"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "refs/tags/v${version}"; - hash = "sha256-oEXulUsppaSOUwonY61tYPm7f3homNrb+rOpm+c/M84="; + hash = "sha256-Kxaf5bOFvvX6qoCyCIyGaL8eDp3C7MXQdSziiCDrfRs="; }; build-system = [ From 266d23ef5dc5127dbe66d272a4707e54ca3e0723 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 00:38:04 +0000 Subject: [PATCH 044/206] chicken: 5.3.0 -> 5.4.0 --- pkgs/development/compilers/chicken/5/chicken.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/chicken.nix b/pkgs/development/compilers/chicken/5/chicken.nix index dd15b5394bc9..2f0b8316ae8b 100644 --- a/pkgs/development/compilers/chicken/5/chicken.nix +++ b/pkgs/development/compilers/chicken/5/chicken.nix @@ -10,13 +10,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "chicken"; - version = "5.3.0"; + version = "5.4.0"; binaryVersion = 11; src = fetchurl { url = "https://code.call-cc.org/releases/${finalAttrs.version}/chicken-${finalAttrs.version}.tar.gz"; - sha256 = "sha256-w62Z2PnhftgQkS75gaw7DC4vRvsOzAM7XDttyhvbDXY="; + sha256 = "sha256-PF1KphwRZ79tm/nq+JHadjC6n188Fb8JUVpwOb/N7F8="; }; # Disable two broken tests: "static link" and "linking tests" From 27d453cf9441a723251acb5d32409ad77384dc72 Mon Sep 17 00:00:00 2001 From: Sumner Evans Date: Tue, 16 Jul 2024 22:06:18 -0600 Subject: [PATCH 045/206] matrix-synapse-unwrapped: 1.110.0 -> 1.111.0 This also reverts d2e41f147f6a4b4930393077822a6738a80ac283 as it is no longer necessary after https://github.com/element-hq/synapse/pull/17353. This also adds the python-multipart dependency that was added in https://github.com/element-hq/synapse/pull/17365 Signed-off-by: Sumner Evans --- pkgs/servers/matrix-synapse/default.nix | 39 +++++++++---------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 177cee956ca1..ab7573c683e5 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchFromGitHub -, fetchPypi , python3 , openssl , libiconv @@ -13,39 +12,25 @@ }: let - python = python3.override { - packageOverrides = self: super: { - netaddr = super.netaddr.overridePythonAttrs (oldAttrs: rec { - version = "1.0.0"; - - src = fetchPypi { - pname = "netaddr"; - inherit version; - hash = "sha256-6wRrVTVOelv4AcBJAq6SO9aZGQJC2JsJnolvmycktNM="; - }; - }); - }; - }; - - plugins = python.pkgs.callPackage ./plugins { }; + plugins = python3.pkgs.callPackage ./plugins { }; tools = callPackage ./tools { }; in -python.pkgs.buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.110.0"; + version = "1.111.0"; format = "pyproject"; src = fetchFromGitHub { owner = "element-hq"; repo = "synapse"; rev = "v${version}"; - hash = "sha256-DsDQgmHDU+iJ+00p1uch9Zj6lleDvdTQMy05hi8R9CM="; + hash = "sha256-CgoJJK2pqkHU8X6oisY19uN6zyjGL8W3irTsraFOYQM="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-J0JBp9pCP00Cjs6T4litjhY28mq0OJDBrRZVSQaS03w="; + hash = "sha256-uKyy2m3bvo6U++Qx6t7maeIp84QfMzslPGV1so4ZT3U="; }; postPatch = '' @@ -63,7 +48,7 @@ python.pkgs.buildPythonApplication rec { sed -i 's/Pillow = ".*"/Pillow = ">=5.4.0"/' pyproject.toml ''; - nativeBuildInputs = with python.pkgs; [ + nativeBuildInputs = with python3.pkgs; [ poetry-core rustPlatform.cargoSetupHook setuptools-rust @@ -77,7 +62,7 @@ python.pkgs.buildPythonApplication rec { libiconv ]; - propagatedBuildInputs = with python.pkgs; [ + propagatedBuildInputs = with python3.pkgs; [ attrs bcrypt bleach @@ -89,6 +74,7 @@ python.pkgs.buildPythonApplication rec { jsonschema matrix-common msgpack + python-multipart netaddr packaging phonenumbers @@ -110,7 +96,7 @@ python.pkgs.buildPythonApplication rec { ] ++ twisted.optional-dependencies.tls; - passthru.optional-dependencies = with python.pkgs; { + passthru.optional-dependencies = with python3.pkgs; { postgres = if isPyPy then [ psycopg2cffi ] else [ @@ -148,7 +134,7 @@ python.pkgs.buildPythonApplication rec { nativeCheckInputs = [ openssl - ] ++ (with python.pkgs; [ + ] ++ (with python3.pkgs; [ mock parameterized ]) @@ -169,14 +155,15 @@ python.pkgs.buildPythonApplication rec { NIX_BUILD_CORES=4 fi - PYTHONPATH=".:$PYTHONPATH" ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests + PYTHONPATH=".:$PYTHONPATH" ${python3.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tests runHook postCheck ''; passthru = { tests = { inherit (nixosTests) matrix-synapse matrix-synapse-workers; }; - inherit plugins tools python; + inherit plugins tools; + python = python3; }; meta = with lib; { From cdb80175853c2e743e2d5c7243af06bd667d38e8 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 16 Jul 2024 22:12:42 -0700 Subject: [PATCH 046/206] freebsd.mkDerivation: re-add missing hunk --- pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index ec4b698116b9..3ff7258734ef 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -2,8 +2,10 @@ lib, stdenv, stdenvNoCC, + stdenvNoLibs, + overrideCC, + buildPackages, versionData, - writeText, patches, compatIfNeeded, freebsd-lib, @@ -21,7 +23,15 @@ lib.makeOverridable ( attrs: let - stdenv' = if attrs.noCC or false then stdenvNoCC else stdenv; + stdenv' = + if attrs.noCC or false then + stdenvNoCC + else if attrs.noLibc or false then + stdenvNoLibs + else if attrs.noLibcxx or false then + overrideCC stdenv buildPackages.llvmPackages.clangNoLibcxx + else + stdenv; in stdenv'.mkDerivation ( rec { From 8e26d7ca856c055f7bf15b32ab9e94b1b4d3c917 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Tue, 16 Jul 2024 22:29:11 -0700 Subject: [PATCH 047/206] freebsd.mkDerivation: do not crash on packages not using FreeBSD src This includes drm-kmod and drm-kmod firmware. --- pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix | 3 +++ pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix index 42806392d217..c604ee573628 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/drm-kmod/package.nix @@ -22,6 +22,9 @@ let fetchOptions = (lib.importJSON ./versions.json).${branch}; in mkDerivation { + # this derivation is tricky; it is not an in-tree FreeBSD build but it is meant to be built + # at the same time as the in-tree FreeBSD code, so it expects the same environment. Therefore, + # it is appropriate to use the freebsd mkDerivation. pname = "drm-kmod"; version = branch; diff --git a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix index ec4b698116b9..c574d7dd80ec 100644 --- a/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix +++ b/pkgs/os-specific/bsd/freebsd/pkgs/mkDerivation.nix @@ -107,7 +107,9 @@ lib.makeOverridable ( // { patches = (lib.optionals (attrs.autoPickPatches or true) ( - freebsd-lib.filterPatches patches (attrs.extraPaths or [ ] ++ [ attrs.path ]) + freebsd-lib.filterPatches patches ( + attrs.extraPaths or [ ] ++ (lib.optional (attrs ? path) attrs.path) + ) )) ++ attrs.patches or [ ]; } From 4494b6d93e734879b1e637bcbb5074543207ecab Mon Sep 17 00:00:00 2001 From: Martin Joerg Date: Wed, 17 Jul 2024 09:17:25 +0000 Subject: [PATCH 048/206] quickemu: 4.9.5 -> 4.9.6 https://github.com/quickemu-project/quickemu/releases/tag/4.9.6 https://github.com/quickemu-project/quickemu/compare/4.9.5...4.9.6 --- pkgs/by-name/qu/quickemu/package.nix | 57 +++++++++++++--------------- 1 file changed, 27 insertions(+), 30 deletions(-) diff --git a/pkgs/by-name/qu/quickemu/package.nix b/pkgs/by-name/qu/quickemu/package.nix index 1f8e0cf07118..a97fcb46727d 100644 --- a/pkgs/by-name/qu/quickemu/package.nix +++ b/pkgs/by-name/qu/quickemu/package.nix @@ -10,7 +10,6 @@ gnugrep, gnused, jq, - ncurses, pciutils, procps, python3, @@ -26,45 +25,45 @@ zsync, OVMF, OVMFFull, - quickemu, testers, installShellFiles, }: let - runtimePaths = [ - cdrtools - curl - gawk - gnugrep - gnused - jq - ncurses - pciutils - procps - python3 - qemu_full - socat - swtpm - util-linux - unzip - xrandr - zsync - ] ++ lib.optionals stdenv.isLinux [ - glxinfo - usbutils - xdg-user-dirs - ]; + runtimePaths = + [ + cdrtools + curl + gawk + gnugrep + gnused + jq + pciutils + procps + python3 + qemu_full + socat + swtpm + util-linux + unzip + xrandr + zsync + ] + ++ lib.optionals stdenv.isLinux [ + glxinfo + usbutils + xdg-user-dirs + ]; in stdenv.mkDerivation (finalAttrs: { pname = "quickemu"; - version = "4.9.5"; + version = "4.9.6"; src = fetchFromGitHub { owner = "quickemu-project"; repo = "quickemu"; rev = finalAttrs.version; - hash = "sha256-UlpNujF2E8H1zcWTen8D29od60pY8FaGueviT0iwupQ="; + hash = "sha256-VaA39QNZNaomvSBMzJMjYN0KOTwWw2798KE8VnM+1so="; }; postPatch = '' @@ -99,9 +98,7 @@ stdenv.mkDerivation (finalAttrs: { runHook postInstall ''; - passthru.tests = testers.testVersion { - package = quickemu; - }; + passthru.tests = testers.testVersion { package = finalAttrs.finalPackage; }; meta = { description = "Quickly create and run optimised Windows, macOS and Linux virtual machines"; From c5aa149ef9d87cc49f4861b5cc9f054aa31d614d Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 11:27:35 -0300 Subject: [PATCH 049/206] bash-5: remove dtzWill as maintainer [orphan] Since theey is not active in a long span of time. --- pkgs/shells/bash/5.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/shells/bash/5.nix b/pkgs/shells/bash/5.nix index a757834a4f2d..578e338dcb0e 100644 --- a/pkgs/shells/bash/5.nix +++ b/pkgs/shells/bash/5.nix @@ -154,7 +154,7 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3Plus; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "bash"; }; } From 2ac414fa93a63a0c33eb24233655726a559563ef Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 12:08:08 -0300 Subject: [PATCH 050/206] treewide: remove dtzWill as maintainer [no orphans] Since theey is not active in a long span of time. None of the packages in this commit are orphan. --- pkgs/applications/misc/minder/default.nix | 2 +- pkgs/applications/misc/vit/default.nix | 2 +- .../networking/instant-messengers/fractal/default.nix | 2 +- pkgs/applications/office/mendeley/default.nix | 2 +- pkgs/applications/office/planify/default.nix | 2 +- pkgs/applications/system/qjournalctl/default.nix | 2 +- pkgs/data/fonts/inter/default.nix | 2 +- pkgs/data/fonts/victor-mono/default.nix | 2 +- pkgs/data/icons/bibata-cursors/translucent.nix | 2 +- pkgs/development/libraries/editline/default.nix | 2 +- pkgs/development/libraries/libfido2/default.nix | 2 +- pkgs/development/tools/analysis/retdec/default.nix | 2 +- pkgs/development/tools/wllvm/default.nix | 2 +- pkgs/os-specific/linux/fnotifystat/default.nix | 2 +- pkgs/tools/system/proot/default.nix | 2 +- 15 files changed, 15 insertions(+), 15 deletions(-) diff --git a/pkgs/applications/misc/minder/default.nix b/pkgs/applications/misc/minder/default.nix index e4e58d9bf6c3..d3e931116e77 100644 --- a/pkgs/applications/misc/minder/default.nix +++ b/pkgs/applications/misc/minder/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/phase1geo/Minder"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; mainProgram = "com.github.phase1geo.minder"; }; } diff --git a/pkgs/applications/misc/vit/default.nix b/pkgs/applications/misc/vit/default.nix index 59e0345fc402..bc2d73869a60 100644 --- a/pkgs/applications/misc/vit/default.nix +++ b/pkgs/applications/misc/vit/default.nix @@ -34,7 +34,7 @@ buildPythonApplication rec { homepage = "https://github.com/scottkosty/vit"; description = "Visual Interactive Taskwarrior"; mainProgram = "vit"; - maintainers = with maintainers; [ dtzWill arcnmx ]; + maintainers = with maintainers; [ arcnmx ]; platforms = platforms.all; license = licenses.mit; }; diff --git a/pkgs/applications/networking/instant-messengers/fractal/default.nix b/pkgs/applications/networking/instant-messengers/fractal/default.nix index cdbddfe9959a..56593cc315cb 100644 --- a/pkgs/applications/networking/instant-messengers/fractal/default.nix +++ b/pkgs/applications/networking/instant-messengers/fractal/default.nix @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { homepage = "https://gitlab.gnome.org/GNOME/fractal"; changelog = "https://gitlab.gnome.org/World/fractal/-/releases/${version}"; license = licenses.gpl3Plus; - maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler dtzWill ]); + maintainers = teams.gnome.members ++ (with maintainers; [ anselmschueler ]); platforms = platforms.linux; mainProgram = "fractal"; }; diff --git a/pkgs/applications/office/mendeley/default.nix b/pkgs/applications/office/mendeley/default.nix index 089e7ca057e5..56b771afdeaf 100644 --- a/pkgs/applications/office/mendeley/default.nix +++ b/pkgs/applications/office/mendeley/default.nix @@ -38,7 +38,7 @@ in appimageTools.wrapType2 { sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ dtzWill atila ]; + maintainers = with maintainers; [ atila ]; mainProgram = "mendeley-reference-manager"; }; diff --git a/pkgs/applications/office/planify/default.nix b/pkgs/applications/office/planify/default.nix index 3a084c358469..1181989a3013 100644 --- a/pkgs/applications/office/planify/default.nix +++ b/pkgs/applications/office/planify/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { description = "Task manager with Todoist support designed for GNU/Linux"; homepage = "https://github.com/alainm23/planify"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "io.github.alainm23.planify"; }; diff --git a/pkgs/applications/system/qjournalctl/default.nix b/pkgs/applications/system/qjournalctl/default.nix index d3bec7e306d5..5c8714677ad9 100644 --- a/pkgs/applications/system/qjournalctl/default.nix +++ b/pkgs/applications/system/qjournalctl/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/pentix/qjournalctl"; license = licenses.gpl3Only; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill srgom romildo ]; + maintainers = with maintainers; [ srgom romildo ]; }; } diff --git a/pkgs/data/fonts/inter/default.nix b/pkgs/data/fonts/inter/default.nix index 2bed6db734bb..5c7f014f35f7 100644 --- a/pkgs/data/fonts/inter/default.nix +++ b/pkgs/data/fonts/inter/default.nix @@ -24,6 +24,6 @@ stdenvNoCC.mkDerivation rec { description = "Typeface specially designed for user interfaces"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ demize dtzWill ]; + maintainers = with maintainers; [ demize ]; }; } diff --git a/pkgs/data/fonts/victor-mono/default.nix b/pkgs/data/fonts/victor-mono/default.nix index a855cf8b80bb..f5319c008b55 100644 --- a/pkgs/data/fonts/victor-mono/default.nix +++ b/pkgs/data/fonts/victor-mono/default.nix @@ -32,7 +32,7 @@ stdenvNoCC.mkDerivation rec { description = "Free programming font with cursive italics and ligatures"; homepage = "https://rubjo.github.io/victor-mono"; license = licenses.ofl; - maintainers = with maintainers; [ jpotier dtzWill ]; + maintainers = with maintainers; [ jpotier ]; platforms = platforms.all; }; } diff --git a/pkgs/data/icons/bibata-cursors/translucent.nix b/pkgs/data/icons/bibata-cursors/translucent.nix index fa01e05766b4..7cae52a3e4de 100644 --- a/pkgs/data/icons/bibata-cursors/translucent.nix +++ b/pkgs/data/icons/bibata-cursors/translucent.nix @@ -21,6 +21,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/Silicasandwhich/Bibata_Cursor_Translucent"; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill AdsonCicilioti ]; + maintainers = with maintainers; [ AdsonCicilioti ]; }; } diff --git a/pkgs/development/libraries/editline/default.nix b/pkgs/development/libraries/editline/default.nix index 3571554559c7..95776d885f06 100644 --- a/pkgs/development/libraries/editline/default.nix +++ b/pkgs/development/libraries/editline/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "https://troglobit.com/projects/editline/"; description = "Readline() replacement for UNIX without termcap (ncurses)"; license = licenses.bsdOriginal; - maintainers = with maintainers; [ dtzWill oxalica ]; + maintainers = with maintainers; [ oxalica ]; platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libfido2/default.nix b/pkgs/development/libraries/libfido2/default.nix index b3c3cc450237..9511d263109f 100644 --- a/pkgs/development/libraries/libfido2/default.nix +++ b/pkgs/development/libraries/libfido2/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/Yubico/libfido2"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill prusnak ]; + maintainers = with maintainers; [ prusnak ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/analysis/retdec/default.nix b/pkgs/development/tools/analysis/retdec/default.nix index 2448556aa62c..c562479eb052 100644 --- a/pkgs/development/tools/analysis/retdec/default.nix +++ b/pkgs/development/tools/analysis/retdec/default.nix @@ -230,7 +230,7 @@ stdenv.mkDerivation (self: { description = "Retargetable machine-code decompiler based on LLVM"; homepage = "https://retdec.com"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill katrinafyi ]; + maintainers = with maintainers; [ katrinafyi ]; platforms = [ "x86_64-linux" ]; }; }) diff --git a/pkgs/development/tools/wllvm/default.nix b/pkgs/development/tools/wllvm/default.nix index 5a2ef3b16dcf..38e10f726160 100644 --- a/pkgs/development/tools/wllvm/default.nix +++ b/pkgs/development/tools/wllvm/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { homepage = "https://github.com/travitch/whole-program-llvm"; description = "Wrapper script to build whole-program LLVM bitcode files"; license = licenses.mit; - maintainers = with maintainers; [ mic92 dtzWill ]; + maintainers = with maintainers; [ mic92 ]; platforms = platforms.all; }; } diff --git a/pkgs/os-specific/linux/fnotifystat/default.nix b/pkgs/os-specific/linux/fnotifystat/default.nix index 4961450fa36e..28fde2629f69 100644 --- a/pkgs/os-specific/linux/fnotifystat/default.nix +++ b/pkgs/os-specific/linux/fnotifystat/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ColinIanKing/fnotifystat"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ womfoo dtzWill ]; + maintainers = with maintainers; [ womfoo ]; }; } diff --git a/pkgs/tools/system/proot/default.nix b/pkgs/tools/system/proot/default.nix index 79f96cccf39f..adcbb1de9d2a 100644 --- a/pkgs/tools/system/proot/default.nix +++ b/pkgs/tools/system/proot/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { description = "User-space implementation of chroot, mount --bind and binfmt_misc"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ianwookim makefu veprbl dtzWill ]; + maintainers = with maintainers; [ ianwookim makefu veprbl ]; mainProgram = "proot"; }; } From 3a194eb094a3c3e64e21358e9085faf825a30309 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 17 Jul 2024 18:39:55 +0200 Subject: [PATCH 051/206] qemu: 9.0.1 -> 9.0.2 Fixes: CVE-2024-4467 --- pkgs/applications/virtualization/qemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 982eee2cbb1f..6f4241444b62 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -55,11 +55,11 @@ stdenv.mkDerivation (finalAttrs: { + lib.optionalString hostCpuOnly "-host-cpu-only" + lib.optionalString nixosTestRunner "-for-vm-tests" + lib.optionalString toolsOnly "-utils"; - version = "9.0.1"; + version = "9.0.2"; src = fetchurl { url = "https://download.qemu.org/qemu-${finalAttrs.version}.tar.xz"; - hash = "sha256-0PTbD70VHAzxb4SusqUA9ulQCXMlRvRNr6uNIEm7uAU="; + hash = "sha256-qMP1lq7Olto7AMr7dLqvoNFFFer7jtHuP39cLQ6/ArY="; }; depsBuildBuild = [ buildPackages.stdenv.cc ] From 6dba240f79031e544b92983635885c94f665bd07 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Jul 2024 13:52:45 -0300 Subject: [PATCH 052/206] treewide: remove dtzWill as maintainer [orphans] Since theey is not active in a long span of time. All the packages in this commit are now orphan. --- pkgs/applications/audio/radiotray-ng/default.nix | 2 +- pkgs/applications/misc/heimer/default.nix | 2 +- pkgs/applications/misc/notable/default.nix | 2 +- .../pidgin/pidgin-plugins/purple-googlechat/default.nix | 2 +- .../networking/instant-messengers/slack-term/default.nix | 2 +- pkgs/applications/office/ktimetracker/default.nix | 2 +- pkgs/applications/science/math/nota/default.nix | 2 +- pkgs/applications/version-management/lab/default.nix | 2 +- pkgs/applications/video/catt/default.nix | 2 +- pkgs/by-name/fa/fac/package.nix | 2 +- pkgs/data/fonts/agave/default.nix | 2 +- pkgs/data/fonts/ankacoder/condensed.nix | 2 +- pkgs/data/fonts/ankacoder/default.nix | 2 +- pkgs/data/fonts/cherry/default.nix | 2 +- pkgs/data/fonts/d2coding/default.nix | 2 +- pkgs/data/fonts/hermit/default.nix | 2 +- pkgs/data/fonts/luculent/default.nix | 2 +- pkgs/data/fonts/manrope/default.nix | 2 +- pkgs/data/fonts/national-park/default.nix | 2 +- pkgs/data/fonts/public-sans/default.nix | 2 +- pkgs/data/fonts/redhat-official/default.nix | 2 +- pkgs/data/fonts/spleen/default.nix | 2 +- pkgs/data/fonts/sudo/default.nix | 2 +- pkgs/data/themes/adementary/default.nix | 2 +- pkgs/development/compilers/firrtl/default.nix | 2 +- pkgs/development/libraries/libcbor/default.nix | 2 +- pkgs/development/libraries/libexecinfo/default.nix | 2 +- pkgs/development/libraries/libykclient/default.nix | 2 +- pkgs/development/libraries/yubico-pam/default.nix | 2 +- pkgs/development/mobile/webos/cmake-modules.nix | 2 +- pkgs/development/mobile/webos/novacom.nix | 2 +- pkgs/development/mobile/webos/novacomd.nix | 2 +- pkgs/development/python-modules/lit/default.nix | 2 +- pkgs/development/tools/analysis/snowman/default.nix | 2 +- pkgs/development/tools/bloaty/default.nix | 2 +- pkgs/development/tools/boomerang/default.nix | 2 +- pkgs/development/tools/gllvm/default.nix | 2 +- pkgs/development/tools/misc/creduce/default.nix | 2 +- pkgs/development/tools/misc/csmith/default.nix | 2 +- pkgs/development/tools/misc/elfinfo/default.nix | 2 +- pkgs/development/tools/misc/elfkickers/default.nix | 2 +- pkgs/development/tools/misc/go-license-detector/default.nix | 2 +- pkgs/development/tools/misc/gtkperf/default.nix | 2 +- pkgs/development/tools/misc/libwhich/default.nix | 2 +- pkgs/development/tools/misc/whatstyle/default.nix | 2 +- pkgs/games/nudoku/default.nix | 2 +- pkgs/os-specific/linux/cpustat/default.nix | 2 +- pkgs/servers/irker/default.nix | 2 +- pkgs/tools/misc/bdf2sfd/default.nix | 2 +- pkgs/tools/misc/fx-cast-bridge/default.nix | 2 +- 50 files changed, 50 insertions(+), 50 deletions(-) diff --git a/pkgs/applications/audio/radiotray-ng/default.nix b/pkgs/applications/audio/radiotray-ng/default.nix index 51dbc26f5617..c583f08d02f7 100644 --- a/pkgs/applications/audio/radiotray-ng/default.nix +++ b/pkgs/applications/audio/radiotray-ng/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { description = "Internet radio player for linux"; homepage = "https://github.com/ebruck/radiotray-ng"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/heimer/default.nix b/pkgs/applications/misc/heimer/default.nix index 8672169d02ab..7f9b1ae96bbb 100644 --- a/pkgs/applications/misc/heimer/default.nix +++ b/pkgs/applications/misc/heimer/default.nix @@ -32,7 +32,7 @@ mkDerivation rec { homepage = "https://github.com/juzzlin/Heimer"; changelog = "https://github.com/juzzlin/Heimer/blob/${version}/CHANGELOG"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/misc/notable/default.nix b/pkgs/applications/misc/notable/default.nix index 0021cc722125..4dde27827c96 100644 --- a/pkgs/applications/misc/notable/default.nix +++ b/pkgs/applications/misc/notable/default.nix @@ -40,6 +40,6 @@ appimageTools.wrapType2 rec { homepage = "https://github.com/notable/notable"; license = licenses.unfree; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix index b274b55ac228..217b87c26aba 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/pidgin-plugins/purple-googlechat/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { description = "Native Google Chat support for pidgin"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/networking/instant-messengers/slack-term/default.nix b/pkgs/applications/networking/instant-messengers/slack-term/default.nix index 2750336cf1d1..b03446d88981 100644 --- a/pkgs/applications/networking/instant-messengers/slack-term/default.nix +++ b/pkgs/applications/networking/instant-messengers/slack-term/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { description = "Slack client for your terminal"; homepage = "https://github.com/erroneousboat/slack-term"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "slack-term"; }; } diff --git a/pkgs/applications/office/ktimetracker/default.nix b/pkgs/applications/office/ktimetracker/default.nix index 58720625cc8e..0bca13475338 100644 --- a/pkgs/applications/office/ktimetracker/default.nix +++ b/pkgs/applications/office/ktimetracker/default.nix @@ -28,6 +28,6 @@ kio knotifications kwindowsystem kxmlgui ktextwidgets mainProgram = "ktimetracker"; license = licenses.gpl2; homepage = "https://userbase.kde.org/KTimeTracker"; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/applications/science/math/nota/default.nix b/pkgs/applications/science/math/nota/default.nix index eae11806d725..6b13c8160cfb 100644 --- a/pkgs/applications/science/math/nota/default.nix +++ b/pkgs/applications/science/math/nota/default.nix @@ -36,6 +36,6 @@ mkDerivation rec { description = "Most beautiful command line calculator"; homepage = "https://kary.us/nota"; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = with lib.maintainers; [ ]; mainProgram = "nota"; } diff --git a/pkgs/applications/version-management/lab/default.nix b/pkgs/applications/version-management/lab/default.nix index 0a4637d533fb..9155f7398c8a 100644 --- a/pkgs/applications/version-management/lab/default.nix +++ b/pkgs/applications/version-management/lab/default.nix @@ -36,7 +36,7 @@ buildGoModule rec { description = "Lab wraps Git or Hub, making it simple to clone, fork, and interact with repositories on GitLab"; homepage = "https://zaquestion.github.io/lab"; license = licenses.cc0; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "lab"; }; } diff --git a/pkgs/applications/video/catt/default.nix b/pkgs/applications/video/catt/default.nix index 608236d68830..5b22b30e7682 100644 --- a/pkgs/applications/video/catt/default.nix +++ b/pkgs/applications/video/catt/default.nix @@ -63,7 +63,7 @@ python.pkgs.buildPythonApplication rec { description = "Tool to send media from online sources to Chromecast devices"; homepage = "https://github.com/skorokithakis/catt"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "catt"; }; } diff --git a/pkgs/by-name/fa/fac/package.nix b/pkgs/by-name/fa/fac/package.nix index e7b09e73b355..93aff4bec617 100644 --- a/pkgs/by-name/fa/fac/package.nix +++ b/pkgs/by-name/fa/fac/package.nix @@ -38,6 +38,6 @@ buildGoModule rec { homepage = "https://github.com/mkchoi212/fac"; license = lib.licenses.mit; mainProgram = "fac"; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/agave/default.nix b/pkgs/data/fonts/agave/default.nix index d2ecda3a1118..83efef0ab9b6 100644 --- a/pkgs/data/fonts/agave/default.nix +++ b/pkgs/data/fonts/agave/default.nix @@ -30,7 +30,7 @@ in stdenv.mkDerivation { description = "truetype monospaced typeface designed for X environments"; homepage = "https://b.agaric.net/page/agave"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/ankacoder/condensed.nix b/pkgs/data/fonts/ankacoder/condensed.nix index 676c3cf85602..bf56f5abc0f9 100644 --- a/pkgs/data/fonts/ankacoder/condensed.nix +++ b/pkgs/data/fonts/ankacoder/condensed.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { description = "Anka/Coder Condensed font"; homepage = "https://code.google.com/archive/p/anka-coder-fonts"; license = licenses.ofl; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/ankacoder/default.nix b/pkgs/data/fonts/ankacoder/default.nix index c363f025bfd2..8497cbdee3fd 100644 --- a/pkgs/data/fonts/ankacoder/default.nix +++ b/pkgs/data/fonts/ankacoder/default.nix @@ -23,7 +23,7 @@ stdenvNoCC.mkDerivation rec { description = "Anka/Coder fonts"; homepage = "https://code.google.com/archive/p/anka-coder-fonts"; license = licenses.ofl; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/cherry/default.nix b/pkgs/data/fonts/cherry/default.nix index 2e9577751551..8bdfb6f94f6e 100644 --- a/pkgs/data/fonts/cherry/default.nix +++ b/pkgs/data/fonts/cherry/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "cherry font"; homepage = "https://github.com/turquoise-hexagon/cherry"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/d2coding/default.nix b/pkgs/data/fonts/d2coding/default.nix index be6f0809ed97..e5b6a59af488 100644 --- a/pkgs/data/fonts/d2coding/default.nix +++ b/pkgs/data/fonts/d2coding/default.nix @@ -30,6 +30,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://github.com/naver/d2codingfont"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/hermit/default.nix b/pkgs/data/fonts/hermit/default.nix index 3ff770522d9e..ce69b0080908 100644 --- a/pkgs/data/fonts/hermit/default.nix +++ b/pkgs/data/fonts/hermit/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { description = "monospace font designed to be clear, pragmatic and very readable"; homepage = "https://pcaro.es/p/hermit"; license = licenses.ofl; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/luculent/default.nix b/pkgs/data/fonts/luculent/default.nix index 1347af957e46..09d07a2a1d0c 100644 --- a/pkgs/data/fonts/luculent/default.nix +++ b/pkgs/data/fonts/luculent/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { description = "luculent font"; homepage = "http://www.eastfarthing.com/luculent/"; license = licenses.ofl; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/manrope/default.nix b/pkgs/data/fonts/manrope/default.nix index e42d7879af74..90982efbc809 100644 --- a/pkgs/data/fonts/manrope/default.nix +++ b/pkgs/data/fonts/manrope/default.nix @@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.gent.media/manrope"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/national-park/default.nix b/pkgs/data/fonts/national-park/default.nix index 4970e0d5920f..0a1e320f7876 100644 --- a/pkgs/data/fonts/national-park/default.nix +++ b/pkgs/data/fonts/national-park/default.nix @@ -23,6 +23,6 @@ stdenvNoCC.mkDerivation rec { signs that are carved using a router bit''; homepage = "https://nationalparktypeface.com/"; license = licenses.ofl; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/public-sans/default.nix b/pkgs/data/fonts/public-sans/default.nix index 18e1b66e0ec5..45a8540d080d 100644 --- a/pkgs/data/fonts/public-sans/default.nix +++ b/pkgs/data/fonts/public-sans/default.nix @@ -24,7 +24,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://public-sans.digital.gov/"; changelog = "https://github.com/uswds/public-sans/raw/v${version}/FONTLOG.txt"; license = licenses.ofl; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/fonts/redhat-official/default.nix b/pkgs/data/fonts/redhat-official/default.nix index 76782d510509..df0f867b7a92 100644 --- a/pkgs/data/fonts/redhat-official/default.nix +++ b/pkgs/data/fonts/redhat-official/default.nix @@ -27,6 +27,6 @@ stdenvNoCC.mkDerivation rec { description = "Red Hat's Open Source Fonts - Red Hat Display and Red Hat Text"; license = licenses.ofl; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/spleen/default.nix b/pkgs/data/fonts/spleen/default.nix index ef9e2956b924..c5edbc5051c3 100644 --- a/pkgs/data/fonts/spleen/default.nix +++ b/pkgs/data/fonts/spleen/default.nix @@ -31,6 +31,6 @@ stdenvNoCC.mkDerivation rec { description = "Monospaced bitmap fonts"; homepage = "https://www.cambus.net/spleen-monospaced-bitmap-fonts"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/data/fonts/sudo/default.nix b/pkgs/data/fonts/sudo/default.nix index 8f5ef089533b..a69c947ce449 100644 --- a/pkgs/data/fonts/sudo/default.nix +++ b/pkgs/data/fonts/sudo/default.nix @@ -22,7 +22,7 @@ stdenvNoCC.mkDerivation rec { homepage = "https://www.kutilek.de/sudo-font/"; changelog = "https://github.com/jenskutilek/sudo-font/raw/v${version}/sudo/FONTLOG.txt"; license = licenses.ofl; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/data/themes/adementary/default.nix b/pkgs/data/themes/adementary/default.nix index 8b03132bfcb7..fb3431cc139b 100644 --- a/pkgs/data/themes/adementary/default.nix +++ b/pkgs/data/themes/adementary/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { description = "Adwaita-based GTK theme with design influence from elementary OS and Vertex GTK theme"; homepage = "https://github.com/hrdwrrsk/adementary-theme"; license = licenses.gpl3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/compilers/firrtl/default.nix b/pkgs/development/compilers/firrtl/default.nix index 54138a6d3de8..e5f10739d6a9 100644 --- a/pkgs/development/compilers/firrtl/default.nix +++ b/pkgs/development/compilers/firrtl/default.nix @@ -56,6 +56,6 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.chisel-lang.org/firrtl/"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libcbor/default.nix b/pkgs/development/libraries/libcbor/default.nix index 349f4589172a..4cd36f44013f 100644 --- a/pkgs/development/libraries/libcbor/default.nix +++ b/pkgs/development/libraries/libcbor/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation (finalAttrs: { description = "CBOR protocol implementation for C and others"; homepage = "https://github.com/PJK/libcbor"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; }) diff --git a/pkgs/development/libraries/libexecinfo/default.nix b/pkgs/development/libraries/libexecinfo/default.nix index 36f956e77724..b2ce5b0b2cfc 100644 --- a/pkgs/development/libraries/libexecinfo/default.nix +++ b/pkgs/development/libraries/libexecinfo/default.nix @@ -48,6 +48,6 @@ stdenv.mkDerivation rec { description = "Quick-n-dirty BSD licensed clone of the GNU libc backtrace facility"; license = licenses.bsd2; homepage = "https://www.freshports.org/devel/libexecinfo"; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/libykclient/default.nix b/pkgs/development/libraries/libykclient/default.nix index 240f771e49f1..9113b5b6a1a7 100644 --- a/pkgs/development/libraries/libykclient/default.nix +++ b/pkgs/development/libraries/libykclient/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation { mainProgram = "ykclient"; homepage = "https://developers.yubico.com/yubico-c-client"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/libraries/yubico-pam/default.nix b/pkgs/development/libraries/yubico-pam/default.nix index bcd6a245bb4f..742f581f7e33 100644 --- a/pkgs/development/libraries/yubico-pam/default.nix +++ b/pkgs/development/libraries/yubico-pam/default.nix @@ -33,6 +33,6 @@ stdenv.mkDerivation rec { mainProgram = "ykpamcfg"; homepage = "https://developers.yubico.com/yubico-pam"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/mobile/webos/cmake-modules.nix b/pkgs/development/mobile/webos/cmake-modules.nix index 0f73646c7691..5ee1d58615b0 100644 --- a/pkgs/development/mobile/webos/cmake-modules.nix +++ b/pkgs/development/mobile/webos/cmake-modules.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = with lib; { description = "CMake modules needed to build Open WebOS components"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/mobile/webos/novacom.nix b/pkgs/development/mobile/webos/novacom.nix index eca29dd2fabd..d82e6daeda46 100644 --- a/pkgs/development/mobile/webos/novacom.nix +++ b/pkgs/development/mobile/webos/novacom.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Utility for communicating with WebOS devices"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/mobile/webos/novacomd.nix b/pkgs/development/mobile/webos/novacomd.nix index 34559354c275..64ec15661c3e 100644 --- a/pkgs/development/mobile/webos/novacomd.nix +++ b/pkgs/development/mobile/webos/novacomd.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "Daemon for communicating with WebOS devices"; mainProgram = "novacomd"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/python-modules/lit/default.nix b/pkgs/development/python-modules/lit/default.nix index 6d4aec66c750..ac518e81ff17 100644 --- a/pkgs/development/python-modules/lit/default.nix +++ b/pkgs/development/python-modules/lit/default.nix @@ -33,6 +33,6 @@ buildPythonPackage rec { mainProgram = "lit"; homepage = "http://llvm.org/docs/CommandGuide/lit.html"; license = lib.licenses.ncsa; - maintainers = with lib.maintainers; [ dtzWill ]; + maintainers = with lib.maintainers; [ ]; }; } diff --git a/pkgs/development/tools/analysis/snowman/default.nix b/pkgs/development/tools/analysis/snowman/default.nix index 870f084580b8..4e2af64c607b 100644 --- a/pkgs/development/tools/analysis/snowman/default.nix +++ b/pkgs/development/tools/analysis/snowman/default.nix @@ -25,7 +25,7 @@ mkDerivation rec { # https://github.com/yegord/snowman/blob/master/doc/licenses.asciidoc license = licenses.gpl3Plus; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/bloaty/default.nix b/pkgs/development/tools/bloaty/default.nix index f9b133f2aaa7..7f2fb6daeaf7 100644 --- a/pkgs/development/tools/bloaty/default.nix +++ b/pkgs/development/tools/bloaty/default.nix @@ -60,6 +60,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/google/bloaty"; license = licenses.asl20; platforms = platforms.unix; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/boomerang/default.nix b/pkgs/development/tools/boomerang/default.nix index e0e6823b0a27..d173403e3dea 100644 --- a/pkgs/development/tools/boomerang/default.nix +++ b/pkgs/development/tools/boomerang/default.nix @@ -33,6 +33,6 @@ mkDerivation rec { homepage = "https://github.com/BoomerangDecompiler/boomerang"; license = licenses.bsd3; description = "General, open source, retargetable decompiler"; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/gllvm/default.nix b/pkgs/development/tools/gllvm/default.nix index 14b24d91dac5..457895c06164 100644 --- a/pkgs/development/tools/gllvm/default.nix +++ b/pkgs/development/tools/gllvm/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://github.com/SRI-CSL/gllvm"; description = "Whole Program LLVM: wllvm ported to go"; license = licenses.bsd3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/creduce/default.nix b/pkgs/development/tools/misc/creduce/default.nix index e41d8d3379fe..7adc78013f47 100644 --- a/pkgs/development/tools/misc/creduce/default.nix +++ b/pkgs/development/tools/misc/creduce/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { property. It is intended for use by people who discover and report bugs in compilers and other tools that process C/C++ code. ''; - maintainers = [ maintainers.dtzWill ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/csmith/default.nix b/pkgs/development/tools/misc/csmith/default.nix index 529339c38c11..52955577ee7f 100644 --- a/pkgs/development/tools/misc/csmith/default.nix +++ b/pkgs/development/tools/misc/csmith/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { Csmith has found bugs in every tool that it has tested, and has been used to find and report more than 400 previously unknown compiler bugs. ''; - maintainers = [ maintainers.dtzWill ]; + maintainers = [ ]; platforms = platforms.all; }; } diff --git a/pkgs/development/tools/misc/elfinfo/default.nix b/pkgs/development/tools/misc/elfinfo/default.nix index 6b0c5b21af41..2af3f4cd3987 100644 --- a/pkgs/development/tools/misc/elfinfo/default.nix +++ b/pkgs/development/tools/misc/elfinfo/default.nix @@ -22,6 +22,6 @@ buildGoModule rec { homepage = "https://elfinfo.roboticoverlords.org/"; changelog = "https://github.com/xyproto/elfinfo/releases/tag/${version}"; license = licenses.bsd3; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/elfkickers/default.nix b/pkgs/development/tools/misc/elfkickers/default.nix index fa2ed6e39534..9a612593d06f 100644 --- a/pkgs/development/tools/misc/elfkickers/default.nix +++ b/pkgs/development/tools/misc/elfkickers/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { description = "Collection of programs that access and manipulate ELF files"; platforms = platforms.linux; license = licenses.gpl2Plus; - maintainers = [ maintainers.dtzWill ]; + maintainers = [ ]; }; } diff --git a/pkgs/development/tools/misc/go-license-detector/default.nix b/pkgs/development/tools/misc/go-license-detector/default.nix index cbef7ae0d9da..81f35d7ec481 100644 --- a/pkgs/development/tools/misc/go-license-detector/default.nix +++ b/pkgs/development/tools/misc/go-license-detector/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { description = "Reliable project licenses detector"; homepage = "https://github.com/go-enry/go-license-detector"; license = licenses.asl20; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "license-detector"; }; } diff --git a/pkgs/development/tools/misc/gtkperf/default.nix b/pkgs/development/tools/misc/gtkperf/default.nix index a478306cad67..bee2b85c78da 100644 --- a/pkgs/development/tools/misc/gtkperf/default.nix +++ b/pkgs/development/tools/misc/gtkperf/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { mainProgram = "gtkperf"; homepage = "https://gtkperf.sourceforge.net/"; license = with licenses; [ gpl2 ]; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/libwhich/default.nix b/pkgs/development/tools/misc/libwhich/default.nix index 915e1018c561..c6d89a4c6bdb 100644 --- a/pkgs/development/tools/misc/libwhich/default.nix +++ b/pkgs/development/tools/misc/libwhich/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { mainProgram = "libwhich"; homepage = "https://github.com/vtjnash/libwhich"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/development/tools/misc/whatstyle/default.nix b/pkgs/development/tools/misc/whatstyle/default.nix index 4293a458977b..acfaa7873655 100644 --- a/pkgs/development/tools/misc/whatstyle/default.nix +++ b/pkgs/development/tools/misc/whatstyle/default.nix @@ -25,7 +25,7 @@ python3.pkgs.buildPythonApplication rec { mainProgram = "whatstyle"; homepage = "https://github.com/mikr/whatstyle"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/pkgs/games/nudoku/default.nix b/pkgs/games/nudoku/default.nix index cb09c466c8d5..e9ebeadf4513 100644 --- a/pkgs/games/nudoku/default.nix +++ b/pkgs/games/nudoku/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { homepage = "http://jubalh.github.io/nudoku/"; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; }; } diff --git a/pkgs/os-specific/linux/cpustat/default.nix b/pkgs/os-specific/linux/cpustat/default.nix index 84a4fc53933e..8d58f3ff785f 100644 --- a/pkgs/os-specific/linux/cpustat/default.nix +++ b/pkgs/os-specific/linux/cpustat/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ColinIanKing/cpustat"; license = licenses.gpl2Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "cpustat"; }; } diff --git a/pkgs/servers/irker/default.nix b/pkgs/servers/irker/default.nix index 28f6b60cf76b..7fae20bc1edb 100644 --- a/pkgs/servers/irker/default.nix +++ b/pkgs/servers/irker/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation { description = "IRC client that runs as a daemon accepting notification requests"; homepage = "https://gitlab.com/esr/irker"; license = licenses.bsd2; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "irkerd"; platforms = platforms.unix; }; diff --git a/pkgs/tools/misc/bdf2sfd/default.nix b/pkgs/tools/misc/bdf2sfd/default.nix index 73a72ffeb61a..b5b9cd5ec751 100644 --- a/pkgs/tools/misc/bdf2sfd/default.nix +++ b/pkgs/tools/misc/bdf2sfd/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/fcambus/bdf2sfd"; license = licenses.bsd2; platforms = platforms.all; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "bdf2sfd"; }; } diff --git a/pkgs/tools/misc/fx-cast-bridge/default.nix b/pkgs/tools/misc/fx-cast-bridge/default.nix index 722905df951f..11402d8f455c 100644 --- a/pkgs/tools/misc/fx-cast-bridge/default.nix +++ b/pkgs/tools/misc/fx-cast-bridge/default.nix @@ -52,7 +52,7 @@ buildNpmPackage rec { description = "Implementation of the Chrome Sender API (Chromecast) within Firefox"; homepage = "https://hensm.github.io/fx_cast/"; license = licenses.mit; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ ]; mainProgram = "fx_cast_bridge"; }; } From 09b16ef79b850d4ef7664b2482ffaf3f6fcc78d0 Mon Sep 17 00:00:00 2001 From: Konstantin Astafurov Date: Wed, 17 Jul 2024 15:28:20 -0400 Subject: [PATCH 053/206] chickenPackages.chickenEggs: update --- .../development/compilers/chicken/5/deps.toml | 129 +++++++++++------- 1 file changed, 82 insertions(+), 47 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index bbc256db52dd..dc162bbe13c4 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -2,9 +2,9 @@ [7off] dependencies = ["anaphora", "define-options", "lowdown", "matchable", "srfi-1", "sxml-transforms", "sxpath", "utf8", "srfi-42", "srfi-69", "strse", "uri-common"] license = "agpl" -sha256 = "06nzh23bpf9f011wr5sxqnq4nb1b7af6148qz52ri9hbb8r2mi4i" +sha256 = "1z35j4py67c3x2f87mzvczpbbcskd80d5m7a7080gfxzrmwrn2c9" synopsis = "Markdown to Gemini text" -version = "1.32" +version = "1.33" [F-operator] dependencies = ["miscmacros", "datatype", "box"] @@ -70,11 +70,11 @@ synopsis = "SRFI-69-like library for alists" version = "0.3.0" [allegro] -dependencies = ["foreigners"] +dependencies = ["foreigners", "chicken"] license = "bsd" -sha256 = "14w7q0iwskrqbqfjspf5wxnxb8wn56q9xbpc0vz518azm9ndf63p" +sha256 = "1c83294hv7czfx45yczchvgnd3k72d26ya5mhf365zmrkbzqylfz" synopsis = "Allegro" -version = "3.0.0" +version = "4.0.0" [amb] dependencies = ["srfi-1"] @@ -107,9 +107,9 @@ version = "0.6" [apropos] dependencies = ["utf8", "srfi-1", "symbol-utils", "check-errors"] license = "bsd" -sha256 = "01h8fpz32bc3c9ldyamawvj7jf2b4b10zz08a22i90ww5lyvn90s" +sha256 = "1w0kyycm8j30fd7iv9zs852rx5jpsmv2xs0lplpcjhmv2a3dlmv1" synopsis = "CHICKEN apropos" -version = "3.10.2" +version = "3.11.1" [arcadedb] dependencies = ["medea"] @@ -226,9 +226,9 @@ version = "1.0" [beaker] dependencies = ["begin-syntax", "debugger-protocol", "schematic", "srfi-1", "srfi-13", "srfi-14", "srfi-69", "vector-lib", "with-current-directory", "module-declarations"] license = "bsd" -sha256 = "1nxzqjwh3bi2zyifdpn0wb86352rizjpfl3lfi34f3g6m95avmmg" +sha256 = "1ilsr7gl8dr8wv5n0v9kgpmy6a7j6v581ykl2bb6fbnnssfq655z" synopsis = "Lab supplies for CHICKEN development" -version = "0.0.22" +version = "0.0.23" [begin-syntax] dependencies = ["matchable", "module-declarations"] @@ -345,9 +345,9 @@ version = "1.2" [breadline] dependencies = ["apropos", "srfi-18"] license = "gpl-3" -sha256 = "1rvppf2aci4dxn6a74nzzj1iw7is65ad38fbvrr9harazfx6j4jy" +sha256 = "1kkga2n6vw2hxg9sd20f6swnj6hikddyiamsdbqp5m72nlxkq72c" synopsis = "Bindings to readline" -version = "0.11" +version = "0.12" [brev-separate] dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"] @@ -597,9 +597,9 @@ version = "1.0" [condition-utils] dependencies = ["srfi-1", "srfi-69", "check-errors"] license = "bsd" -sha256 = "11mkmbyciyrqyakp1gyfvmbfayglhzx2x6j6zyp9kj31vhi2y4hd" +sha256 = "1g3vi4pn3z66qldbw4h5731xvi2hd37l887czzbj2a2pbwv4rfp3" synopsis = "SRFI 12 Condition Utilities" -version = "2.2.3" +version = "2.3.1" [continuations] dependencies = [] @@ -735,11 +735,11 @@ synopsis = "Directed graph in adjacency list format." version = "2.0" [directory-utils] -dependencies = ["srfi-1", "utf8", "miscmacros", "moremacros", "stack", "list-utils", "check-errors"] +dependencies = ["srfi-1", "utf8", "miscmacros", "stack", "check-errors"] license = "bsd" -sha256 = "0xiga98dddi5vg5h1m2vws5prk4ri96rx6l359lji62aq51h526i" +sha256 = "17306fd9brbifvc3ahzfwcam9px2fs1674m8wzbyr6hzh9bhw62z" synopsis = "directory-utils" -version = "2.3.0" +version = "2.4.1" [disjoint-set] dependencies = [] @@ -1078,11 +1078,11 @@ synopsis = "Chicken bindings to genann - a simple neural network library in ANSI version = "0.2.2" [generalized-arrays] -dependencies = ["r7rs", "srfi-48", "srfi-128", "srfi-133", "srfi-160", "check-errors", "transducers"] +dependencies = ["r7rs", "srfi-48", "srfi-128", "srfi-133", "srfi-143", "srfi-160", "check-errors", "transducers"] license = "bsd-3" -sha256 = "1ypga6lanhqsm8lpgk6s1nj4q024xb9kl9ar58cwj53h1irn7942" +sha256 = "0zimlx33nn4val556sbwzgcsrpavz02dmk78hbv2xrjasraq36zn" synopsis = "Provides generalized arrays, intervals, and storage classes for CHICKEN Scheme." -version = "2.0.0" +version = "2.0.2" [generics] dependencies = ["simple-cells"] @@ -1290,9 +1290,9 @@ version = "0.3" [http-client] dependencies = ["intarweb", "uri-common", "simple-md5", "sendfile", "srfi-1", "srfi-13", "srfi-18", "srfi-69"] license = "bsd" -sha256 = "0d24dpi8c45rvwfm31hd033rpyghx9xps1qdki8czcl6500bcy7y" +sha256 = "16f1ch4sdb1lfwfq5fa142sjzgvd2l4c6b5q750cfkfz8p6zi1vw" synopsis = "High-level HTTP client library" -version = "1.2.1" +version = "1.2.2" [http-session] dependencies = ["intarweb", "simple-sha1", "spiffy", "srfi-1", "srfi-18", "srfi-69", "uri-common"] @@ -1511,6 +1511,13 @@ sha256 = "0sl8i18g03cl8qpaqbrfkcx7xd28jyxcb183873s9yq7max4zryr" synopsis = "Evaluate expressions once" version = "0.3" +[lay] +dependencies = [] +license = "bsd" +sha256 = "1z7n51p6yzn9bd4l7jxh3mrq45a6h8mi95s2v2d9xgn3m0dmbhqi" +synopsis = "Lay eggs efficiently" +version = "0.2.2" + [lazy-ffi] dependencies = ["bind", "srfi-1", "srfi-69"] license = "bsd" @@ -1651,6 +1658,13 @@ sha256 = "1zc9prn3n4rac6ibgbfg0fcdl0czf31qhx8v2276m49i7hizvan4" synopsis = "Efficient color types and math" version = "0.1.1" +[magic-pipes] +dependencies = ["srfi-38", "typed-records", "args", "alist-lib", "sql-de-lite", "medea", "ssql", "ssax", "sxml-serializer"] +license = "bsd" +sha256 = "1rxsy3mdagw713d6qhgyrq73gvgrvr4w1vgbs41zkkv1ck3ggqys" +synopsis = "Unix shell pipeline tools for working with s-expressions" +version = "1.3" + [magic] dependencies = [] license = "bsd" @@ -1710,9 +1724,9 @@ version = "1.2" [math-utils] dependencies = [] license = "public-domain" -sha256 = "1jcr67q4pq7i34lkhbqml18rkv6w61wsqclp9k1xgvg6p2b0aaxj" +sha256 = "1vc8xrah2yngfbwvah1948h156dp1lw75nrapjcmvybc2315fn93" synopsis = "Miscellaneous math utilities" -version = "1.0.6" +version = "1.1.0" [math] dependencies = ["srfi-1", "r6rs-bytevectors", "miscmacros", "srfi-133", "srfi-42"] @@ -1794,9 +1808,9 @@ version = "4.3.6" [message-digest-utils] dependencies = ["blob-utils", "string-utils", "memory-mapped-files", "message-digest-primitive", "message-digest-type", "check-errors"] license = "bsd" -sha256 = "004da7czv5mqxz8cif2nc0shx1xxj266alqm2370h13wbdl369c3" +sha256 = "04pxzqnirv04hcjik1v2mz59vvfgxfanfsgwy6q0ai17as2kaajr" synopsis = "Message Digest Support" -version = "4.3.5" +version = "4.3.7" [message-digest] dependencies = ["message-digest-primitive", "message-digest-type", "message-digest-utils"] @@ -1892,9 +1906,9 @@ version = "2.5.3" [mosquitto] dependencies = ["srfi-1"] license = "mit" -sha256 = "1pdhks3wii43l5wbmqich93zk6vy0b62h8qhv1k2wd8llv33gx6r" +sha256 = "1kc5kh9lp17lpx48br8mb2wg78li7g4kq606dq86v02kwj1b4xh1" synopsis = "Bindings to mosquitto MQTT client library" -version = "0.1.4" +version = "0.1.5" [mpd-client] dependencies = ["regex", "srfi-1"] @@ -2011,9 +2025,9 @@ version = "1.21" [openssl] dependencies = ["srfi-1", "srfi-13", "srfi-18", "address-info"] license = "bsd" -sha256 = "018x80cxs7glvqn7nhjcfbvw36bn3pf4y24a6cn7mz25z6597vg0" +sha256 = "1x6y0i9mgfxiays044babfkz7jy2635gy9c27fab5knvhhdqz6lg" synopsis = "Bindings to the OpenSSL SSL/TLS library" -version = "2.2.5" +version = "2.2.6" [operations] dependencies = ["srfi-1"] @@ -2155,6 +2169,13 @@ sha256 = "06sqn5gz5n2zfdk5z2c20mz4r6w9mslxvlanvmq1wdzr5qnvkh9s" synopsis = "Bindings for PostgreSQL's C-api" version = "4.1.4" +[poule] +dependencies = ["datatype", "mailbox", "matchable", "srfi-1", "srfi-18", "typed-records"] +license = "bsd" +sha256 = "0ldh8jzqcrscgkr16s8hqjmqqxligb37xffk8s8kqa2y9sbk9d96" +synopsis = "Manage pools of worker processes" +version = "0.1.1" + [prefixes] dependencies = ["tree-walkers"] license = "bsd" @@ -2183,6 +2204,13 @@ sha256 = "0770cpzd75jky6pjn57z9f8gg7jiy5a4lng798ndcqhzfqvmbfdi" synopsis = "procedural-macros made easy" version = "3.0.1" +[procedure-decoration] +dependencies = ["check-errors"] +license = "bsd" +sha256 = "0sid5fcw9pvf8n1zq5i757pzdr4hgx5w55qgrabsxpq5pgxj6gbs" +synopsis = "Procedure Decoration API" +version = "3.0.0" + [protobj] dependencies = [] license = "lgpl-2.1" @@ -2284,9 +2312,9 @@ version = "0.1.1" [r7rs] dependencies = ["matchable", "srfi-1", "srfi-13"] license = "bsd" -sha256 = "1rwx52mjsylvbkmpg0z7jbawaf87dsxdgwgq8z5nh8k5nb03b6v5" +sha256 = "1mipp3qafsfk4fsldi9qvggzlkby7a7glydhjjf5ifb8w6f4kx8f" synopsis = "R7RS compatibility" -version = "1.0.9" +version = "1.0.10" [rabbit] dependencies = ["srfi-1"] @@ -2414,6 +2442,13 @@ sha256 = "1vngrvh2b7rv5n5zvksfg27zikpc7d8xb8n1kd0pyfr7hna00wf9" synopsis = "Serialization of arbitrary data." version = "0.9.12" +[s48-modules] +dependencies = ["srfi-1"] +license = "bsd" +sha256 = "1pn8igkydivysrlgc1l0c2j1cn3yvsb7ggbpfbrpdkwxb9wm810b" +synopsis = "basic Scheme48 module syntax" +version = "0.7" + [s9fes-char-graphics] dependencies = ["srfi-1", "utf8", "format"] license = "public-domain" @@ -2480,9 +2515,9 @@ version = "0.3.2" [scheme-indent] dependencies = ["srfi-1"] license = "bsd" -sha256 = "1jjgi0wwfk3bx8ayc09y09pxg9awdx5hm397gqhg6gvjbn3sm3in" +sha256 = "0czcmlcapq33f4g19x11q2nd3yrnf2mvb8hm2lcc2an6fp2gg4hc" synopsis = "A Scheme code indenter" -version = "0.6" +version = "0.7" [scheme2c-compatibility] dependencies = ["srfi-1", "srfi-13", "srfi-14", "traversal", "foreigners", "xlib"] @@ -2550,9 +2585,9 @@ version = "0.4.1" [semantic-version] dependencies = ["utf8", "srfi-1", "vector-lib", "srfi-69", "srfi-128", "record-variants"] license = "bsd" -sha256 = "10wczj83664q09zxgcnf1zr96xds6dmfvn0gvw8cq4i269ppcv0j" +sha256 = "0aig2n1q08rqbvwl74ly4x05gzy7hc47n5dqgbn4zjg5539d77qd" synopsis = "Semantic Version Utilities" -version = "0.0.16" +version = "0.0.17" [sendfile] dependencies = ["memory-mapped-files"] @@ -3031,11 +3066,11 @@ synopsis = "SRFI 141: Integer division" version = "1.0.0" [srfi-143] -dependencies = [] +dependencies = ["r7rs"] license = "mit" -sha256 = "0a30ysddklf2mndh5chhkdx5zqlkgyxggwxypgn7znmny23zlrja" +sha256 = "1zfl2mv6ma97yf6p1ql5a3v50brk5b0h61p2dzyz2n2qi81mrfgm" synopsis = "SRFI 143: Fixnums" -version = "0.4.1" +version = "1.0.0" [srfi-144] dependencies = ["r7rs"] @@ -3145,9 +3180,9 @@ version = "1.0.3" [srfi-19] dependencies = ["srfi-1", "utf8", "srfi-18", "srfi-29", "miscmacros", "locale", "record-variants", "check-errors"] license = "bsd" -sha256 = "0vqwg2sknm7fm677npbjdvhcfa2s6l41sgvhkk11m10b8jgnr1b3" +sha256 = "06lr89dgaslq218434al3nd18zdnp6rm4c6gr96pcglhjarcyv1n" synopsis = "Time Data Types and Procedures" -version = "4.9.6" +version = "4.9.8" [srfi-193] dependencies = [] @@ -3425,9 +3460,9 @@ version = "0.3" [stack] dependencies = ["record-variants", "check-errors"] license = "bsd" -sha256 = "0fcpsh9rgibkz807jwr062bcjzz7x93pv5x9xniycpjp6i3s5r2x" +sha256 = "00hh6kagnj7xsrg8i4wig1jp8y5v5g2887zgnfvqd5ibxr232g54" synopsis = "Provides LIFO queue (stack) operations" -version = "3.1.0" +version = "3.2.0" [stalin] dependencies = [] @@ -3579,9 +3614,9 @@ version = "2.6.0" [synch] dependencies = ["srfi-18", "check-errors"] license = "bsd" -sha256 = "0hqwk1xfrslcyigjj9z28lki8xdb1x1ccvss225mnmahpdn42pp8" +sha256 = "09vf7ljkpiiaib8wslpjnabhqw70l6z5aqkp3nx223nqh4qgr8mb" synopsis = "Synchronization Forms" -version = "3.3.8" +version = "3.3.9" [sysexits] dependencies = [] @@ -3731,11 +3766,11 @@ synopsis = "tracing and breakpoints" version = "2.0" [transducers] -dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-146", "srfi-160", "check-errors"] +dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors"] license = "mit" -sha256 = "1bz05dy7kjypk85yck3a8h6iji6kkmnb48kpqdqvj9nm0kvg2nwd" +sha256 = "194clggnwmv7g0v4y5q8brr4aac3rs4ddzigxbls0pmdr925chlb" synopsis = "Transducers for working with foldable data types." -version = "0.5.4" +version = "0.5.5" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] From 014c159c310feb8b6084cfaea0fe0fb954362e88 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 22:08:18 +0000 Subject: [PATCH 054/206] termscp: 0.13.0 -> 0.14.0 --- pkgs/tools/networking/termscp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/termscp/default.nix b/pkgs/tools/networking/termscp/default.nix index a5777a1f7f28..fdff493abd90 100644 --- a/pkgs/tools/networking/termscp/default.nix +++ b/pkgs/tools/networking/termscp/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "termscp"; - version = "0.13.0"; + version = "0.14.0"; src = fetchFromGitHub { owner = "veeso"; repo = "termscp"; rev = "refs/tags/v${version}"; - hash = "sha256-/Mnoljgp87ML6+3vV1vZTFO0TSY5hr8E8U1fXJq31pE="; + hash = "sha256-XK0bH5ru248tSlD3Sdxb07O6i335dfTFvxDzKdc/3GQ="; }; - cargoHash = "sha256-xq21cncEYNSwDiKvVSM1J2Jz3TqOkYMK3gckKpM5+6E="; + cargoHash = "sha256-DzKxVqE0GMmpkxLH3raASgha9qGGs4kaUdSaviUwvdM="; nativeBuildInputs = [ pkg-config From 43c3cb6dff84e8089b47d20a72a9171e582d9a08 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Jul 2024 22:26:26 +0000 Subject: [PATCH 055/206] victoriametrics: 1.101.0 -> 1.102.0 --- pkgs/by-name/vi/victoriametrics/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/vi/victoriametrics/package.nix b/pkgs/by-name/vi/victoriametrics/package.nix index d17b8ce22974..21853f0519d5 100644 --- a/pkgs/by-name/vi/victoriametrics/package.nix +++ b/pkgs/by-name/vi/victoriametrics/package.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "VictoriaMetrics"; - version = "1.101.0"; + version = "1.102.0"; src = fetchFromGitHub { owner = "VictoriaMetrics"; repo = "VictoriaMetrics"; rev = "v${version}"; - hash = "sha256-Jjz/CbVCvc9NFbvzYTFthG8cov4pYpc6y1A1Kmd3Mjg="; + hash = "sha256-5p50DEL5XhXncJKH2ebFkh9/l0EABj+Pebf5oHV1yk8="; }; vendorHash = null; From 96f4c0fde85b7078c6ef58b710ffd8fd12dd05ee Mon Sep 17 00:00:00 2001 From: t4ccer Date: Mon, 15 Jul 2024 13:55:10 -0600 Subject: [PATCH 056/206] non: fix outdated waf --- pkgs/applications/audio/non/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/non/default.nix b/pkgs/applications/audio/non/default.nix index f6f2ba3f73c9..bd4c83742930 100644 --- a/pkgs/applications/audio/non/default.nix +++ b/pkgs/applications/audio/non/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation { ladspaH liblo libsigcxx lrdf ]; + # NOTE: non provides its own waf script that is incompatible with new + # python versions. If the script is not present, wafHook will install + # a compatible version from nixpkgs. + prePatch = '' + rm waf + ''; + env.CXXFLAGS = "-std=c++14"; meta = { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90d8537e215b..c54715ad6b13 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23253,7 +23253,9 @@ with pkgs; nntp-proxy = callPackage ../applications/networking/nntp-proxy { }; - non = callPackage ../applications/audio/non { }; + non = callPackage ../applications/audio/non { + wafHook = (waf.override { extraTools = [ "gccdeps" ]; }).hook; + }; ntl = callPackage ../development/libraries/ntl { }; From 866f468a2b06742b06bacb99fb8c592d9e6d0cf3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 07:06:31 +0000 Subject: [PATCH 057/206] awscli2: 2.17.5 -> 2.17.13 --- pkgs/by-name/aw/awscli2/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/aw/awscli2/package.nix b/pkgs/by-name/aw/awscli2/package.nix index ff441ea316c6..4ba5c6cfc162 100644 --- a/pkgs/by-name/aw/awscli2/package.nix +++ b/pkgs/by-name/aw/awscli2/package.nix @@ -59,14 +59,14 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli2"; - version = "2.17.5"; # N.B: if you change this, check if overrides are still up-to-date + version = "2.17.13"; # N.B: if you change this, check if overrides are still up-to-date pyproject = true; src = fetchFromGitHub { owner = "aws"; repo = "aws-cli"; rev = "refs/tags/${version}"; - hash = "sha256-Y8qXAKEDW82dZSNx88X2PSPY88VkBgwK67Ya0hHk3tU="; + hash = "sha256-hnD+2NE7gqbe99UQmRlHoPGdWZj0o2Buvk3kRR15tgI="; }; postPatch = '' From bdf81d0b5fc871872bffe1a650994e0a2d9c1374 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 07:15:49 +0000 Subject: [PATCH 058/206] brave: 1.67.123 -> 1.67.134 --- .../networking/browsers/brave/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 13e1a71d45e0..abb49edcc0dc 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -6,17 +6,17 @@ callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) if stdenv.isAarch64 then { pname = "brave"; - version = "1.67.123"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_arm64.deb"; - hash = "sha256-YcTwa1sTKpLn9O4/M11nrjgItD6ktug1GFw0tNcZplg="; + version = "1.67.134"; + url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_arm64.deb"; + hash = "sha256-5wa4y+3PlcrT+U7xiPjkXqhpFz1rC+wyH6q9blmjaCI="; platform = "aarch64-linux"; } else if stdenv.isx86_64 then { pname = "brave"; - version = "1.67.123"; - url = "https://github.com/brave/brave-browser/releases/download/v1.67.123/brave-browser_1.67.123_amd64.deb"; - hash = "sha256-L9Jcug6HQxJ4E2C9p8BdwxkD75F2j+HaEmgjdrU9oEo="; + version = "1.67.134"; + url = "https://github.com/brave/brave-browser/releases/download/v1.67.134/brave-browser_1.67.134_amd64.deb"; + hash = "sha256-OJYPV3yJkqGh4OdX4lFZNrOxv33ysFQSTwYmlToXOq8="; platform = "x86_64-linux"; } else From c02466f1bbbce91313566d8de4b204684c6cad0b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 08:35:21 +0000 Subject: [PATCH 059/206] radicle-httpd: 0.13.0 -> 0.14.0 --- pkgs/by-name/ra/radicle-httpd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ra/radicle-httpd/package.nix b/pkgs/by-name/ra/radicle-httpd/package.nix index f1f9e5e5993f..6f2333e3d745 100644 --- a/pkgs/by-name/ra/radicle-httpd/package.nix +++ b/pkgs/by-name/ra/radicle-httpd/package.nix @@ -13,17 +13,17 @@ }: rustPlatform.buildRustPackage rec { pname = "radicle-httpd"; - version = "0.13.0"; + version = "0.14.0"; env.RADICLE_VERSION = version; src = fetchgit { url = "https://seed.radicle.xyz/z4V1sjrXqjvFdnCUbxPFqd5p4DtH5.git"; rev = "refs/namespaces/z6MkkfM3tPXNPrPevKr3uSiQtHPuwnNhu2yUVjgd2jXVsVz5/refs/tags/v${version}"; - hash = "sha256-C7kMREIEq2nv+mq/YXS4yPNKgJxz5tTzqRwO9CtM1Bg="; + hash = "sha256-WuaKYX3rGcIGmz4OAtCvoSwWUr09qfmXM2KI4uGu9s0="; sparseCheckout = [ "radicle-httpd" ]; }; sourceRoot = "${src.name}/radicle-httpd"; - cargoHash = "sha256-fbHg1hwHloy9AZMDCHNVkNTfLMG4Dv6IPxTp8F5okrk="; + cargoHash = "sha256-pe+x4fn45I1+6WaLT23KmO7RyAMNdU+7nwG9GSGSeMc="; nativeBuildInputs = [ asciidoctor From 0ccd244a8dfd807a3aa49aa02ceee0cb44843dba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 18 Jul 2024 02:45:54 -0700 Subject: [PATCH 060/206] vunnel: fix build --- pkgs/by-name/vu/vunnel/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/vu/vunnel/package.nix b/pkgs/by-name/vu/vunnel/package.nix index 53df74f8533c..49ca6562f59e 100644 --- a/pkgs/by-name/vu/vunnel/package.nix +++ b/pkgs/by-name/vu/vunnel/package.nix @@ -18,11 +18,11 @@ python3.pkgs.buildPythonApplication rec { }; pythonRelaxDeps = [ + "defusedxml" "ijson" "sqlalchemy" ]; - build-system = with python3.pkgs; [ poetry-core poetry-dynamic-versioning From 8be3a256fd28c58ce188aef8e23643a383950587 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 18 Jul 2024 12:23:03 +0200 Subject: [PATCH 061/206] chromedriver: 126.0.6478.126 -> 126.0.6478.182 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 7a6ad1abca4d..6dcfdf0e8b5e 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,11 +1,11 @@ { stable = { chromedriver = { - hash_darwin = "sha256-154JPXP5qCM94zQRkRSvPKk6RGIhani7FUwOXgIwUZ0="; + hash_darwin = "sha256-YdQgrcTgyGtSfT6wBedSfBt40DaK3fG+uvB0yanvROU="; hash_darwin_aarch64 = - "sha256-HButB8+2DRiaazyBiT3643sBLaauRAZ1rvmEtt8Whac="; - hash_linux = "sha256-6P9K6XTByonHaZYvOP+jTGizkmVdS8Ryn8UwV4BMGdQ="; - version = "126.0.6478.126"; + "sha256-ht7LoA4ibEcWuXOk+JimCN0sjjPomHBcO8IZFNnMauk="; + hash_linux = "sha256-VeCNeBKsKZ2bEM6Z9lJJaBVRjS1pW2gK2DMvmghfNEA="; + version = "126.0.6478.182"; }; deps = { gn = { From 10c6033249917048251e2812c64b63d6588aa34b Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 18 Jul 2024 12:24:02 +0200 Subject: [PATCH 062/206] chromium: 126.0.6478.126 -> 126.0.6478.182 https://chromereleases.googleblog.com/2024/07/stable-channel-update-for-desktop.html This update includes 10 security fixes. CVEs: CVE-2024-6772 CVE-2024-6773 CVE-2024-6774 CVE-2024-6775 CVE-2024-6776 CVE-2024-6777 CVE-2024-6778 CVE-2024-6779 --- .../networking/browsers/chromium/upstream-info.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 6dcfdf0e8b5e..32d3c4ba21dc 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -15,8 +15,8 @@ version = "2024-05-13"; }; }; - hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; - version = "126.0.6478.126"; + hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4="; + version = "126.0.6478.182"; }; ungoogled-chromium = { deps = { From 74b764ebc9aaa5452a562a9baee757532c949007 Mon Sep 17 00:00:00 2001 From: networkException Date: Thu, 18 Jul 2024 12:24:22 +0200 Subject: [PATCH 063/206] ungoogled-chromium: 126.0.6478.126-1 -> 126.0.6478.182-1 https://chromereleases.googleblog.com/2024/07/stable-channel-update-for-desktop.html This update includes 10 security fixes. CVEs: CVE-2024-6772 CVE-2024-6773 CVE-2024-6774 CVE-2024-6775 CVE-2024-6776 CVE-2024-6777 CVE-2024-6778 CVE-2024-6779 --- .../networking/browsers/chromium/upstream-info.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 32d3c4ba21dc..5a133f0b5bf6 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -27,11 +27,11 @@ version = "2024-05-13"; }; ungoogled-patches = { - hash = "sha256-DLxtXcm4gPVzBeGxjD4harmdQWoH8LKn6GBlhtq/MVM="; - rev = "126.0.6478.126-1"; + hash = "sha256-jDWL4gXcWF6GMlFJ/sua4dfVURs9vWYXRMjnYNqESWc="; + rev = "126.0.6478.182-1"; }; }; - hash = "sha256-Z0QeUG4ykNqdlxXYgLteJQ0jS8apC5kwW5hwlUnhod0="; - version = "126.0.6478.126"; + hash = "sha256-vZ7P8+vHTMCo6lXkV84ENqRZVG3/fDEwl+BTNJTGMn4="; + version = "126.0.6478.182"; }; } From 921f6675bb093bff140cec76227f837e6bb47ed7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 12:43:51 +0000 Subject: [PATCH 064/206] python312Packages.grpcio-testing: 1.64.1 -> 1.65.1 --- pkgs/development/python-modules/grpcio-testing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-testing/default.nix b/pkgs/development/python-modules/grpcio-testing/default.nix index 33ec8143c265..de158fed55a1 100644 --- a/pkgs/development/python-modules/grpcio-testing/default.nix +++ b/pkgs/development/python-modules/grpcio-testing/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "grpcio-testing"; - version = "1.64.1"; + version = "1.65.1"; pyproject = true; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "grpcio_testing"; inherit version; - hash = "sha256-Nta9aurAzEg/iUlYE35Jz7uQ+syH4NMnHNuMGq7XEBw="; + hash = "sha256-AdYhmtubPYxmrGYIbd5LpSu28icVxMzeYO7Qp4RQysE="; }; postPatch = '' From 05ac4ec4974607fdfa681f0a96d0ab2f2436b507 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 13:30:52 +0000 Subject: [PATCH 065/206] trufflehog: 3.79.0 -> 3.80.0 --- pkgs/tools/security/trufflehog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/trufflehog/default.nix b/pkgs/tools/security/trufflehog/default.nix index 6d012096b461..d7aa4577fbc9 100644 --- a/pkgs/tools/security/trufflehog/default.nix +++ b/pkgs/tools/security/trufflehog/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "trufflehog"; - version = "3.79.0"; + version = "3.80.0"; src = fetchFromGitHub { owner = "trufflesecurity"; repo = "trufflehog"; rev = "refs/tags/v${version}"; - hash = "sha256-YgalvCAhtL0y2bVqeI0w/n5eVMIW2QPPbm9zpBzzuAM="; + hash = "sha256-ato5U/fmnOHuToGSXUNi1cbaWHNak7+3rpOZoQrAOfc="; }; - vendorHash = "sha256-fBcBY6P2V2ZkBDqCLk5AMBtGF1vTZzZ8ohxc1BPTSVQ="; + vendorHash = "sha256-Gw/xgfGa2992F0whtioaiKJN0MG+NExat1LIgXo/ec8="; proxyVendor = true; From ee51a9e129b2247a52aec3da129808c56327b0db Mon Sep 17 00:00:00 2001 From: Jason Balaci Date: Thu, 18 Jul 2024 14:21:04 -0400 Subject: [PATCH 066/206] vikunja: 0.24.0 -> 0.24.1 --- pkgs/by-name/vi/vikunja/package.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/vi/vikunja/package.nix b/pkgs/by-name/vi/vikunja/package.nix index baf2d46e36c9..9af6170d5663 100644 --- a/pkgs/by-name/vi/vikunja/package.nix +++ b/pkgs/by-name/vi/vikunja/package.nix @@ -1,12 +1,12 @@ { lib, fetchFromGitHub, stdenv, nodejs, pnpm, buildGoModule, mage, writeShellScriptBin, nixosTests }: let - version = "0.24.0"; + version = "0.24.1"; src = fetchFromGitHub { owner = "go-vikunja"; repo = "vikunja"; rev = "v${version}"; - hash = "sha256-KbtyDGuJN63mFEhAPCqV0tajAq1ZIR3CmN9Deb5XWcU="; + hash = "sha256-39S7Xl8He+unIkAZ9GnjqWHBOfdDj4rSUmrExB+Q6Vc="; }; frontend = stdenv.mkDerivation (finalAttrs: { @@ -17,7 +17,7 @@ let pnpmDeps = pnpm.fetchDeps { inherit (finalAttrs) pname version src sourceRoot; - hash = "sha256-KmeZlvt7DA5uDFSkYS71k8qCaHRw3sSTn1NfJPCJxpA="; + hash = "sha256-iEcic/oQ33IO9tWqIQGfyjSY4YpJ8FckaI59qTgdq3c="; }; nativeBuildInputs = [ @@ -67,7 +67,7 @@ buildGoModule { in [ fakeGit mage ]; - vendorHash = "sha256-SnVCc6SWG6LH2ZzKV1A2dvO9/4wYzwnINO1Kyz1+3kg="; + vendorHash = "sha256-oOa9qTy5jNYq05Tbp9hI4L0OBtKtglhk6Uz380nZH1Y="; inherit frontend; From 289dd22132674e63ad2ce09f987ef12b55f80f35 Mon Sep 17 00:00:00 2001 From: nikstur Date: Thu, 29 Jun 2023 23:22:55 +0200 Subject: [PATCH 067/206] nixos/qemu-vm: simplify building nix store image Summary of this change: - Simplify code. - Stop a disk image from being cached in the binary cache. - Make erofs Nix Store image build in an acceptable time outside of testing environments (like `darwin.builder`). - Do not regress on performance for tests that use many store paths in their Nix store image. - Slightly longer startup time for tests where not many store paths are included in the image (these probably shouldn't use `useNixStoreImage` anyways). - Slightly longer startup time when inputs of VM do not change because the Nix store image is not cached anymore. Remove the `storeImage` built with make-disk-image.nix. This produced a separate derivation which is then cached in the binary cache. These types of images should be avoided because they gunk up the cache as they change frequently. Now all Nix store images, whether read-only or writable are based on the erofs image previously only used for read-only images. Additionally, simplify the way the erofs image is built by copying the paths to include to a separate directory and build the erofs image from there. Before this change, the list of Nix store paths to include in the Nix store image was converted to a complex regex that *excludes* all other paths from a potentially large Nix store. This previous approach suffers from two issues: 1. The regex is complex and, as admitted in the source code of the includes-to-excludes.py script, most likely contains at least one error. This means that it's unlikely that anyone will touch this piece of software again. 2. When the Nix store image is built from a large Nix store (like when you build the VM script to run outside of any testing context) this regex becomes painfully slow. There is at least one prominent use-case where this matters: `darwin.builder`. Benchmarking impressions: - Building Nix store via make-disk-image.nix takes ~25s - Building Nix store as an erofs image takes ~4s - Running nixosTests.qemu-vm-writable-store-image takes ~10s when building the erofs image with the regex vs ~14s when building by copying to a temporary directory. - nixosTests.gitlab which had the biggest gains from the initial erofs change takes the same time as before. - On a host with ~140k paths in /nix/store, building the erofs image with the regex takes 410s as opposed to 6s when copying to a temporary directory. --- .../virtualisation/includes-to-excludes.py | 86 ---------------- nixos/modules/virtualisation/qemu-vm.nix | 97 ++++++------------- 2 files changed, 30 insertions(+), 153 deletions(-) delete mode 100644 nixos/modules/virtualisation/includes-to-excludes.py diff --git a/nixos/modules/virtualisation/includes-to-excludes.py b/nixos/modules/virtualisation/includes-to-excludes.py deleted file mode 100644 index 05ef9c0f23b9..000000000000 --- a/nixos/modules/virtualisation/includes-to-excludes.py +++ /dev/null @@ -1,86 +0,0 @@ - -# Convert a list of strings to a regex that matches everything but those strings -# ... and it had to be a POSIX regex; no negative lookahead :( -# This is a workaround for erofs supporting only exclude regex, not an include list - -import sys -import re -from collections import defaultdict - -# We can configure this script to match in different ways if we need to. -# The regex got too long for the argument list, so we had to truncate the -# hashes and use MATCH_STRING_PREFIX. That's less accurate, and might pick up some -# garbage like .lock files, but only if the sandbox doesn't hide those. Even -# then it should be harmless. - -# Produce the negation of ^a$ -MATCH_EXACTLY = ".+" -# Produce the negation of ^a -MATCH_STRING_PREFIX = "//X" # //X should be epsilon regex instead. Not supported?? -# Produce the negation of ^a/? -MATCH_SUBPATHS = "[^/].*$" - -# match_end = MATCH_SUBPATHS -match_end = MATCH_STRING_PREFIX -# match_end = MATCH_EXACTLY - -def chars_to_inverted_class(letters): - assert len(letters) > 0 - letters = list(letters) - - s = "[^" - - if "]" in letters: - s += "]" - letters.remove("]") - - final = "" - if "-" in letters: - final = "-" - letters.remove("-") - - s += "".join(letters) - - s += final - - s += "]" - - return s - -# There's probably at least one bug in here, but it seems to works well enough -# for filtering store paths. -def strings_to_inverted_regex(strings): - s = "(" - - # Match anything that starts with the wrong character - - chars = defaultdict(list) - - for item in strings: - if item != "": - chars[item[0]].append(item[1:]) - - if len(chars) == 0: - s += match_end - else: - s += chars_to_inverted_class(chars) - - # Now match anything that starts with the right char, but then goes wrong - - for char, sub in chars.items(): - s += "|(" + re.escape(char) + strings_to_inverted_regex(sub) + ")" - - s += ")" - return s - -if __name__ == "__main__": - stdin_lines = [] - for line in sys.stdin: - if line.strip() != "": - stdin_lines.append(line.strip()) - - print("^" + strings_to_inverted_regex(stdin_lines)) - -# Test: -# (echo foo; echo fo/; echo foo/; echo foo/ba/r; echo b; echo az; echo az/; echo az/a; echo ab; echo ab/a; echo ab/; echo abc; echo abcde; echo abb; echo ac; echo b) | grep -vE "$((echo ab; echo az; echo foo;) | python includes-to-excludes.py | tee /dev/stderr )" -# should print ab, az, foo and their subpaths diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index 3cc20464b00b..10f69f3a744a 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -134,32 +134,25 @@ let TMPDIR=$(mktemp -d nix-vm.XXXXXXXXXX --tmpdir) fi - ${lib.optionalString (cfg.useNixStoreImage) - (if cfg.writableStore - then '' - # Create a writable copy/snapshot of the store image. - ${qemu}/bin/qemu-img create -f qcow2 -F qcow2 -b ${storeImage}/nixos.qcow2 "$TMPDIR"/store.img - '' - else '' - ( - cd ${builtins.storeDir} - ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ - --force-uid=0 \ - --force-gid=0 \ - -L ${nixStoreFilesystemLabel} \ - -U eb176051-bd15-49b7-9e6b-462e0b467019 \ - -T 0 \ - --exclude-regex="$( - <${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ - sed -e 's^.*/^^g' \ - | cut -c -10 \ - | ${hostPkgs.python3}/bin/python ${./includes-to-excludes.py} )" \ - "$TMPDIR"/store.img \ - . \ - /dev/null - ) - '' - ) + ${lib.optionalString (cfg.useNixStoreImage) '' + echo "Creating Nix store image..." + + ${hostPkgs.gnutar}/bin/tar --create \ + --absolute-names \ + --verbatim-files-from \ + --transform 'flags=rSh;s|/nix/store/||' \ + --files-from ${hostPkgs.closureInfo { rootPaths = [ config.system.build.toplevel regInfo ]; }}/store-paths \ + | ${hostPkgs.erofs-utils}/bin/mkfs.erofs \ + --force-uid=0 \ + --force-gid=0 \ + -L ${nixStoreFilesystemLabel} \ + -U eb176051-bd15-49b7-9e6b-462e0b467019 \ + -T 0 \ + --tar=f \ + "$TMPDIR"/store.img + + echo "Created Nix store image." + '' } # Create a directory for exchanging data with the VM. @@ -298,21 +291,6 @@ let OVMF = cfg.efi.OVMF; }; - storeImage = import ../../lib/make-disk-image.nix { - name = "nix-store-image"; - inherit pkgs config lib; - additionalPaths = [ regInfo ]; - format = "qcow2"; - onlyNixStore = true; - label = nixStoreFilesystemLabel; - partitionTableType = "none"; - installBootLoader = false; - touchEFIVars = false; - diskSize = "auto"; - additionalSpace = "0M"; - copyChannel = false; - }; - in { @@ -788,10 +766,14 @@ in this can drastically improve performance, but at the cost of disk space and image build time. - As an alternative, you can use a bootloader which will provide you - with a full NixOS system image containing a Nix store and - avoid mounting the host nix store through - {option}`virtualisation.mountHostNixStore`. + The Nix store image is built just-in-time right before the VM is + started. Because it does not produce another derivation, the image is + not cached between invocations and never lands in the store or binary + cache. + + If you want a full disk image with a partition table and a root + filesystem instead of only a store image, enable + {option}`virtualisation.useBootLoader` instead. ''; }; @@ -1019,25 +1001,7 @@ in ]; warnings = - optional ( - cfg.writableStore && - cfg.useNixStoreImage && - opt.writableStore.highestPrio > lib.modules.defaultOverridePriority) - '' - You have enabled ${opt.useNixStoreImage} = true, - without setting ${opt.writableStore} = false. - - This causes a store image to be written to the store, which is - costly, especially for the binary cache, and because of the need - for more frequent garbage collection. - - If you really need this combination, you can set ${opt.writableStore} - explicitly to true, incur the cost and make this warning go away. - Otherwise, we recommend - - ${opt.writableStore} = false; - '' - ++ optional (cfg.directBoot.enable && cfg.useBootLoader) + optional (cfg.directBoot.enable && cfg.useBootLoader) '' You enabled direct boot and a bootloader, QEMU will not boot your bootloader, rendering `useBootLoader` useless. You might want to disable one of those options. @@ -1050,8 +1014,6 @@ in boot.loader.grub.device = mkVMOverride (if cfg.useEFIBoot then "nodev" else cfg.bootLoaderDevice); boot.loader.grub.gfxmodeBios = with cfg.resolution; "${toString x}x${toString y}"; - boot.initrd.kernelModules = optionals (cfg.useNixStoreImage && !cfg.writableStore) [ "erofs" ]; - boot.loader.supportsInitrdSecrets = mkIf (!cfg.useBootLoader) (mkVMOverride false); # After booting, register the closure of the paths in @@ -1171,7 +1133,7 @@ in name = "nix-store"; file = ''"$TMPDIR"/store.img''; deviceExtraOpts.bootindex = "2"; - driveExtraOpts.format = if cfg.writableStore then "qcow2" else "raw"; + driveExtraOpts.format = "raw"; }]) (imap0 (idx: _: { file = "$(pwd)/empty${toString idx}.qcow2"; @@ -1226,6 +1188,7 @@ in }); "/nix/.ro-store" = lib.mkIf cfg.useNixStoreImage { device = "/dev/disk/by-label/${nixStoreFilesystemLabel}"; + fsType = "erofs"; neededForBoot = true; options = [ "ro" ]; }; From afd61894bb6f2ec8f70f28be2e710759182cadfa Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 18 Jul 2024 22:10:00 +0100 Subject: [PATCH 068/206] egl-wayland: 1.1.13 -> 1.1.14 Changes: https://github.com/NVIDIA/egl-wayland/releases/tag/1.1.14 --- pkgs/development/libraries/egl-wayland/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/egl-wayland/default.nix b/pkgs/development/libraries/egl-wayland/default.nix index 7291ff8f8e9d..3cb34f871e3a 100644 --- a/pkgs/development/libraries/egl-wayland/default.nix +++ b/pkgs/development/libraries/egl-wayland/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { pname = "egl-wayland"; - version = "1.1.13"; + version = "1.1.14"; outputs = [ "out" "dev" ]; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { owner = "Nvidia"; repo = pname; rev = version; - hash = "sha256-NA+jr27aYu0XPG9sxnBtjeBTFHmV7TENRsFy8dDdNUc="; + hash = "sha256-MD+D/dRem3ONWGPoZ77j2UKcOCUuQ0nrahEQkNVEUnI="; }; postPatch = '' From c07cdd34decacb4cac467962b20c94b3670d89a0 Mon Sep 17 00:00:00 2001 From: Charles Hall Date: Thu, 18 Jul 2024 16:25:33 -0700 Subject: [PATCH 069/206] cargo-llvm-cov: 0.6.10 -> 0.6.11 --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index 5bced7f36e9c..5c9ac80d56e7 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -26,7 +26,7 @@ let pname = "cargo-llvm-cov"; - version = "0.6.10"; + version = "0.6.11"; owner = "taiki-e"; homepage = "https://github.com/${owner}/${pname}"; @@ -37,7 +37,7 @@ let cargoLock = fetchurl { name = "Cargo.lock"; url = "https://crates.io/api/v1/crates/${pname}/${version}/download"; - sha256 = "sha256-mlmvM/7FQkhSjLtueEJqZU3D86lL8Kf1EFXiY1+b/Oo="; + sha256 = "sha256-/PwzG+Erz1aMDg50glZBP7mNHzuvvn2Dn+dicMG2ouo="; downloadToTemp = true; postFetch = '' tar xzf $downloadedFile ${pname}-${version}/Cargo.lock @@ -55,7 +55,7 @@ rustPlatform.buildRustPackage { inherit owner; repo = pname; rev = "v${version}"; - sha256 = "sha256-yF4i1V50TpR3pEqHQfAK4VTUW+GmT+XU6WVTWMzCUwo="; + sha256 = "sha256-1HZNYC7bMG7olnZH4oOC/fXOAF9qt7MYhlQbaOKDmvg="; }; # Upstream doesn't include the lockfile so we need to add it back @@ -63,7 +63,7 @@ rustPlatform.buildRustPackage { cp ${cargoLock} source/Cargo.lock ''; - cargoSha256 = "sha256-6VQEu38g5a8bfbs8P/nOa3Zg2bSYnEOClzoMF95LAHI="; + cargoSha256 = "sha256-sN3vNZgi45pcDXI8kQ0L/r6HCDGs8l2VMwI+LHjwZ6Q="; # `cargo-llvm-cov` reads these environment variables to find these binaries, # which are needed to run the tests From 7bc4a6807907ea09aa3b61487075201d5a0582e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Jul 2024 23:29:22 +0000 Subject: [PATCH 070/206] kubeshark: 52.3.68 -> 52.3.69 --- pkgs/applications/networking/cluster/kubeshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeshark/default.nix b/pkgs/applications/networking/cluster/kubeshark/default.nix index b888cecc927c..37c0bb3b74ae 100644 --- a/pkgs/applications/networking/cluster/kubeshark/default.nix +++ b/pkgs/applications/networking/cluster/kubeshark/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "kubeshark"; - version = "52.3.68"; + version = "52.3.69"; src = fetchFromGitHub { owner = "kubeshark"; repo = "kubeshark"; rev = "v${version}"; - hash = "sha256-GDK+GR3MUYUgfY3cgaxWIYSE3uiEscp9DeeY36/zOYo="; + hash = "sha256-ZjpuzR+psdZAH7t9uV4jXN6Im1u+JDCDARAxAuBN4nk="; }; vendorHash = "sha256-0WRmAqslZj63m+kCFKIBgoRX47ZyRuU7ZihmF6wmZy4="; From 524b8236f09fc83adc2e4273e3d5e2ee31ef622f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 00:04:38 +0000 Subject: [PATCH 071/206] python312Packages.finvizfinance: 1.0.0 -> 1.0.1 --- pkgs/development/python-modules/finvizfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/finvizfinance/default.nix b/pkgs/development/python-modules/finvizfinance/default.nix index 9d09ace0f578..7e0ad12fd798 100644 --- a/pkgs/development/python-modules/finvizfinance/default.nix +++ b/pkgs/development/python-modules/finvizfinance/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "finvizfinance"; - version = "1.0.0"; + version = "1.0.1"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "lit26"; repo = "finvizfinance"; rev = "refs/tags/v${version}"; - hash = "sha256-cdQdpQWPnMJ69VxOrn8SvNWTRcGt3S/PwoClGO9uh5I="; + hash = "sha256-4aR1x9GgbxnJUpn1+i95djZEVBFTAIzhMLxHe2FaciY="; }; postPatch = '' From 3f4f71f9a4868f34ffb862e31ac717faced9b75e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 00:32:47 +0000 Subject: [PATCH 072/206] linuxhw-edid-fetcher: unstable-2023-05-08 -> 0-unstable-2023-05-08 --- pkgs/by-name/li/linuxhw-edid-fetcher/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix b/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix index 8eb9a4d5b7ad..18c91f1b18cd 100644 --- a/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix +++ b/pkgs/by-name/li/linuxhw-edid-fetcher/package.nix @@ -20,7 +20,7 @@ # "${edids}/lib/firmware/edid/PG278Q_2014.bin"; stdenv.mkDerivation rec { pname = "linuxhw-edid-fetcher"; - version = "unstable-2023-05-08"; + version = "0-unstable-2023-05-08"; src = fetchFromGitHub { owner = "linuxhw"; From c8078ee0599e9852ade9477c15342f8dd4be70a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 01:13:33 +0000 Subject: [PATCH 073/206] python312Packages.ollama: 0.2.1 -> 0.3.0 --- pkgs/development/python-modules/ollama/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ollama/default.nix b/pkgs/development/python-modules/ollama/default.nix index 33433bc17ac9..4db5cface157 100644 --- a/pkgs/development/python-modules/ollama/default.nix +++ b/pkgs/development/python-modules/ollama/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "ollama"; - version = "0.2.1"; + version = "0.3.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "ollama"; repo = "ollama-python"; rev = "refs/tags/v${version}"; - hash = "sha256-+1qhmz5WehbtjE+Dh/WTsqpiAmTjJg+tBjvYRQYkYy0="; + hash = "sha256-+qgWkfrsWeEpU3hiH0KFQSVvF6e7tzMEzXjJJGUSyOU="; }; postPatch = '' From 39b52d31696fbc95ad6d22a0783613b5693c653c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 01:28:46 +0000 Subject: [PATCH 074/206] sqlcmd: 1.7.0 -> 1.8.0 --- pkgs/development/tools/database/sqlcmd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/sqlcmd/default.nix b/pkgs/development/tools/database/sqlcmd/default.nix index f636092ec5c9..15c0542de096 100644 --- a/pkgs/development/tools/database/sqlcmd/default.nix +++ b/pkgs/development/tools/database/sqlcmd/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "sqlcmd"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { repo = "go-sqlcmd"; owner = "microsoft"; rev = "v${version}"; - sha256 = "sha256-69vSRwRl6Ep+lBpy31PkDdEV58yEhtqQBeisaih43CU="; + sha256 = "sha256-QW8cDGXaj/10Y9UsU3WLalnFkf1+2ZBrFpf0Y5eTPUQ="; }; - vendorHash = "sha256-boMvZf8+o1JDaxiyttbW/7hcuTN9wAeTUWT89N0FsSU="; + vendorHash = "sha256-DgIn01nUIX1+JigC1Jr5ZqG3tAYiOPUm6md/TdcD2U4="; proxyVendor = true; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From c9e37098672cfa7c7a9090f1a7e1438fdfa92819 Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 17:22:02 -0400 Subject: [PATCH 075/206] python312Packages.pypillowfight: 0.3.0 -> 0.3.0-unstable-2024-07-07, modernize and remove nose Updates to a recent commit that removes nose in favor of pytest. Also includes a few misc improvements made upstream. --- .../python-modules/pypillowfight/default.nix | 31 ++++++++----------- 1 file changed, 13 insertions(+), 18 deletions(-) diff --git a/pkgs/development/python-modules/pypillowfight/default.nix b/pkgs/development/python-modules/pypillowfight/default.nix index 601db553cf5e..8c001b7ebf82 100644 --- a/pkgs/development/python-modules/pypillowfight/default.nix +++ b/pkgs/development/python-modules/pypillowfight/default.nix @@ -2,44 +2,39 @@ lib, buildPythonPackage, fetchFromGitLab, - nose, pillow, - isPy3k, - isPyPy, + pytestCheckHook, + setuptools, }: buildPythonPackage rec { pname = "pypillowfight"; - version = "0.3.0"; - format = "setuptools"; + version = "0.3.0-unstable-2024-07-07"; + pyproject = true; src = fetchFromGitLab { domain = "gitlab.gnome.org"; group = "World"; owner = "OpenPaperwork"; repo = "libpillowfight"; - rev = version; - sha256 = "096242v425mlqqj5g1giy59p7grxp05g78w6bk37vzph98jrgv3w"; + # Currently no tagged release past 0.3.0 and we need these patches to fix Python 3.12 compat + rev = "4d5f739b725530cd61e709071d31e9f707c64bd6"; + hash = "sha256-o5FzUSDq0lwkXGXRMsS5NB/Mp4Ie833wkxKPziR23f4="; }; prePatch = '' echo '#define INTERNAL_PILLOWFIGHT_VERSION "${version}"' > src/pillowfight/_version.h ''; - # Disable tests because they're designed to only work on Debian: - # https://github.com/jflesch/libpillowfight/issues/2#issuecomment-268259174 - doCheck = false; + build-system = [ setuptools ]; - # Python 2.x is not supported, see: - # https://github.com/jflesch/libpillowfight/issues/1 - disabled = !isPy3k && !isPyPy; + dependencies = [ pillow ]; - # This is needed by setup.py regardless of whether tests are enabled. - buildInputs = [ nose ]; - propagatedBuildInputs = [ pillow ]; + nativeCheckInputs = [ pytestCheckHook ]; - meta = with lib; { + meta = { description = "Library containing various image processing algorithms"; inherit (src.meta) homepage; - license = licenses.gpl3Plus; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ pyrox0 ]; }; } From e9277a608419835c58c32452d4126667d73a1adc Mon Sep 17 00:00:00 2001 From: Pyrox Date: Sun, 14 Jul 2024 17:54:24 -0400 Subject: [PATCH 076/206] python312Packages.fabulous: Fix tests on python 3.12 --- .../python-modules/fabulous/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/fabulous/default.nix b/pkgs/development/python-modules/fabulous/default.nix index 075f01ee6406..d94227989c49 100644 --- a/pkgs/development/python-modules/fabulous/default.nix +++ b/pkgs/development/python-modules/fabulous/default.nix @@ -2,14 +2,16 @@ lib, buildPythonPackage, fetchFromGitHub, + fetchpatch2, pillow, + setuptools, python, }: buildPythonPackage rec { pname = "fabulous"; version = "0.4.0"; - format = "setuptools"; + pyproject = true; src = fetchFromGitHub { owner = "jart"; @@ -18,9 +20,18 @@ buildPythonPackage rec { hash = "sha256-hchlxuB5QP+VxCx+QZ2739/mR5SQmYyE+9kXLKJ2ij4="; }; - patches = [ ./relative_import.patch ]; + patches = [ + ./relative_import.patch + # https://github.com/jart/fabulous/pull/22 + (fetchpatch2 { + url = "https://github.com/jart/fabulous/commit/5779f2dfbc88fd81b5b5865247913d4775e67959.patch?full_index=1"; + hash = "sha256-miWFt4vDpwWhSUgnWDjWUXoibijcDa1c1dDOSkfWoUg="; + }) + ]; - propagatedBuildInputs = [ pillow ]; + build-system = [ setuptools ]; + + dependencies = [ pillow ]; checkPhase = '' for i in tests/*.py; do @@ -28,10 +39,10 @@ buildPythonPackage rec { done ''; - meta = with lib; { + meta = { description = "Make the output of terminal applications look fabulous"; homepage = "https://jart.github.io/fabulous"; - license = licenses.asl20; - maintainers = [ maintainers.symphorien ]; + license = lib.licenses.asl20; + maintainers = [ lib.maintainers.symphorien ]; }; } From 18f09dbb9cf7a7bed53ea5c24d5bba9f88f0517e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 01:34:00 +0000 Subject: [PATCH 077/206] kubeseal: 0.27.0 -> 0.27.1 --- pkgs/applications/networking/cluster/kubeseal/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/kubeseal/default.nix b/pkgs/applications/networking/cluster/kubeseal/default.nix index 10dc9cecfbfc..3d9dac0295ff 100644 --- a/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubeseal"; - version = "0.27.0"; + version = "0.27.1"; src = fetchFromGitHub { owner = "bitnami-labs"; repo = "sealed-secrets"; rev = "v${version}"; - sha256 = "sha256-Ja+z+QmdU37RC9WIczlmzJWN6enhks3jDJLQMV+kfCY="; + sha256 = "sha256-JMYTtEq+I2B1WqEvYQcuUXLtu62KDdR2AtrGS3EupiI="; }; - vendorHash = "sha256-QSF6/8FLXJrM5LAWW0NgDP6U0om2lXsOGP9qDasz+2c="; + vendorHash = "sha256-1Oh+x21RohydebrgKmv5sCDVTJiF/d5A7KWiptEGSiE="; subPackages = [ "cmd/kubeseal" ]; From d7d275085c8a905cac92f3f8c11e332c6d82c8f9 Mon Sep 17 00:00:00 2001 From: Redyf Date: Thu, 18 Jul 2024 22:36:45 -0300 Subject: [PATCH 078/206] ollama: 0.2.5 -> 0.2.7 --- pkgs/by-name/ol/ollama/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ol/ollama/package.nix b/pkgs/by-name/ol/ollama/package.nix index aa731b7fa407..6dd421ec6176 100644 --- a/pkgs/by-name/ol/ollama/package.nix +++ b/pkgs/by-name/ol/ollama/package.nix @@ -32,13 +32,13 @@ let pname = "ollama"; # don't forget to invalidate all hashes each update - version = "0.2.5"; + version = "0.2.7"; src = fetchFromGitHub { owner = "ollama"; repo = "ollama"; rev = "v${version}"; - hash = "sha256-IuSWybyHjewxpLKZxDROqtdyIAWB61+mn4nfvRAyyw0="; + hash = "sha256-YHBGS615dxz6pZR+8awMinp+ZRf3J8Re5BVeDEIyt2E="; fetchSubmodules = true; }; From 4138a4beae8aae3ae2dcc571230422b786c72813 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 01:52:59 +0000 Subject: [PATCH 079/206] hubble: 0.13.5 -> 0.13.6 --- pkgs/applications/networking/cluster/hubble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/hubble/default.nix b/pkgs/applications/networking/cluster/hubble/default.nix index 7cd67fa00316..eba045442581 100644 --- a/pkgs/applications/networking/cluster/hubble/default.nix +++ b/pkgs/applications/networking/cluster/hubble/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "hubble"; - version = "0.13.5"; + version = "0.13.6"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0NApMqLjeYOMxEI8tY2zLxccuSD5nHUGNsya+26ghDY="; + sha256 = "sha256-evtXuVcaKKuAW+04S+IADKf+wJ1MrnGpHLNUbxWd9ZM="; }; vendorHash = null; From 86f0d1aed9756dfe3d36212e3016e4be6f7f3d76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 02:06:08 +0000 Subject: [PATCH 080/206] lact: 0.5.4 -> 0.5.5 --- pkgs/tools/system/lact/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/lact/default.nix b/pkgs/tools/system/lact/default.nix index d51dc2e7ffd1..c8b00995dc5b 100644 --- a/pkgs/tools/system/lact/default.nix +++ b/pkgs/tools/system/lact/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "lact"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "ilya-zlobintsev"; repo = "LACT"; rev = "v${version}"; - hash = "sha256-Umi+J6RnYgHO30kFPFKhhKtqyzsLVPMkeQPeG3I4jcs="; + hash = "sha256-ehJYUZ4Bdttqzs3/SSvhJRzPO7CPbeP8ormXQ7NUzXI="; }; - cargoHash = "sha256-CMK8o1Hcs5E+GtP9EgKmAa5fXHsY5PCYuFQh1zf0YE4="; + cargoHash = "sha256-jG1DfFwpmSSVMu3zKpxg25uTrELcD43bkGbcZI2NOzk="; nativeBuildInputs = [ blueprint-compiler From f791d2f99e8afeabe7d31592e3d88d7a6bb60980 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 02:06:11 +0000 Subject: [PATCH 081/206] c2patool: 0.9.4 -> 0.9.5 --- pkgs/by-name/c2/c2patool/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/c2/c2patool/package.nix b/pkgs/by-name/c2/c2patool/package.nix index 60e2bce7c149..56897befaa4e 100644 --- a/pkgs/by-name/c2/c2patool/package.nix +++ b/pkgs/by-name/c2/c2patool/package.nix @@ -10,16 +10,16 @@ }: rustPlatform.buildRustPackage rec { pname = "c2patool"; - version = "0.9.4"; + version = "0.9.5"; src = fetchFromGitHub { owner = "contentauth"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GS3R1qqL9h7kVQQXl0GBsdWUI8rwtJvRW4Cfqp+VYNU="; + sha256 = "sha256-VmaU8cUtjF5xWOJqK1DB8AAPr1Q7nxOvZVPYsle67Pw="; }; - cargoHash = "sha256-sdlHCPqLsgM1XG3lNfy+ET1xKCKVcdtRcvShxpBW8MQ="; + cargoHash = "sha256-L79hWws9ub02K+3gL6bD5rtEiQGtq0BykxFmsml2EuI="; # use the non-vendored openssl OPENSSL_NO_VENDOR = 1; From ef5417c2a779202849b449c0fa4b5c5ec5a4d0a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 03:24:09 +0000 Subject: [PATCH 082/206] maa-assistant-arknights: 5.3.1 -> 5.4.1 --- pkgs/by-name/ma/maa-assistant-arknights/pin.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ma/maa-assistant-arknights/pin.json b/pkgs/by-name/ma/maa-assistant-arknights/pin.json index 8c2eabfcaefd..9074e2b5f72a 100644 --- a/pkgs/by-name/ma/maa-assistant-arknights/pin.json +++ b/pkgs/by-name/ma/maa-assistant-arknights/pin.json @@ -1,10 +1,10 @@ { "stable": { - "version": "5.3.1", - "hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw=" + "version": "5.4.1", + "hash": "sha256-okVDQyVN+5z7udwSsVVyvg1oTJslpJl2o1qm3HGRqnE=" }, "beta": { - "version": "5.3.1", - "hash": "sha256-4Bz9r4UcaUI5v1upwdD0HclXIUBcNpfnA2iWwofk1zw=" + "version": "5.5.0-beta.1", + "hash": "sha256-q+Iz/yQn71PSm/kW81PMM/2lykZAUgN/DLR9r29ETmI=" } } From 4f266b1338dfcedfb45869d7749fd21ed498c866 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 03:36:00 +0000 Subject: [PATCH 083/206] mpvScripts.videoclip: 0-unstable-2024-05-26 -> 0-unstable-2024-07-18 --- pkgs/applications/video/mpv/scripts/videoclip.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/videoclip.nix b/pkgs/applications/video/mpv/scripts/videoclip.nix index 82f912677f14..4436dca265d1 100644 --- a/pkgs/applications/video/mpv/scripts/videoclip.nix +++ b/pkgs/applications/video/mpv/scripts/videoclip.nix @@ -10,13 +10,13 @@ }: buildLua { pname = "videoclip"; - version = "0-unstable-2024-05-26"; + version = "0-unstable-2024-07-18"; src = fetchFromGitHub { owner = "Ajatt-Tools"; repo = "videoclip"; - rev = "4fd40d66c95905ed828ca77b7120732014b93ac5"; - hash = "sha256-Q40a7BBY4c7I5g9HkeV6Twv/PDPBDKTlnxkILw99pxU="; + rev = "fe731767ca481678b4a166fbce6b30d3eaf8a6ce"; + hash = "sha256-Z63kccjl8jd6C0dvpK7SQnPpmDCgH3/Kzm1oRXJ0NqI="; }; patchPhase = From 67cdb4b05805d996b72cc87fa61c5651a25980ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 03:40:07 +0000 Subject: [PATCH 084/206] netmaker: 0.24.2 -> 0.24.3 --- pkgs/applications/networking/netmaker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/netmaker/default.nix b/pkgs/applications/networking/netmaker/default.nix index e1392d00f4ad..cba1b1d45367 100644 --- a/pkgs/applications/networking/netmaker/default.nix +++ b/pkgs/applications/networking/netmaker/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "netmaker"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "gravitl"; repo = pname; rev = "v${version}"; - hash = "sha256-UR5hUV7HTDaEbltQikgKfQypPXVee46PLP5bBEDFSsg="; + hash = "sha256-gZeIZTEO/5jKUEGRl91Px44tVTerIm1o4kIGj5Y9pb8="; }; - vendorHash = "sha256-roEw8A7TFLoUR7BY4r53HNB1b7IbKwgg7x0e63UGpu8="; + vendorHash = "sha256-ZaHgB9nxOYOVE/kjb62f3Kyow9mpXFUc1Gtvsnu28k8="; inherit subPackages; From edbecfd1470d2a857f128aa1e37b63f6c27716ba Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 03:40:17 +0000 Subject: [PATCH 085/206] netclient: 0.24.2 -> 0.24.3 --- pkgs/by-name/ne/netclient/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ne/netclient/package.nix b/pkgs/by-name/ne/netclient/package.nix index 5b2dc7b8024e..0173274aa02d 100644 --- a/pkgs/by-name/ne/netclient/package.nix +++ b/pkgs/by-name/ne/netclient/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "netclient"; - version = "0.24.2"; + version = "0.24.3"; src = fetchFromGitHub { owner = "gravitl"; repo = "netclient"; rev = "v${version}"; - hash = "sha256-7+r2fuFNVvOC0Zl1kqAiAh9C3qqhg7KGrbnOp4Jk+Is="; + hash = "sha256-EwkjU4MICkCuJJ7a39dKPTuugELprHQUIyXqwmJpev8="; }; - vendorHash = "sha256-eTiNBs8xcfrth/E44URhD8uSgdoXZT1+MD3H24dzI1A="; + vendorHash = "sha256-R/aHXZ0BM2gWouUIezYf63SMqT8vjH2ZhOItgu6RBb4="; buildInputs = lib.optional stdenv.isDarwin darwin.apple_sdk.frameworks.Cocoa ++ lib.optional stdenv.isLinux libX11; From 570204582b5c62850aad281e8fd8beb4d09f25ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 04:02:19 +0000 Subject: [PATCH 086/206] reviewdog: 0.20.0 -> 0.20.1 --- pkgs/development/tools/misc/reviewdog/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/reviewdog/default.nix b/pkgs/development/tools/misc/reviewdog/default.nix index 346ae27a76ec..6d70f5232dd3 100644 --- a/pkgs/development/tools/misc/reviewdog/default.nix +++ b/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.20.0"; + version = "0.20.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-SdsmDZcMjRvXzGMOnhObZYeTtn6R++wiWf/kDfBffHE="; + hash = "sha256-Iu5jFSVg7I0i/GsSqAn90foaTG/6KmLMaqgna/0NOY0="; }; - vendorHash = "sha256-binXUA5oHtNrZwiBMVoBgbnW2xYjhJJFZ7TO9Vii3Cs="; + vendorHash = "sha256-djM2nMwLG16NSBTZyovOvi0ZgzIMANAWhB+tAaqJ02Q="; doCheck = false; From 1859b7d8b0a3ac1aab1d8529e64a373da0bad6b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 04:11:22 +0000 Subject: [PATCH 087/206] spicetify-cli: 2.36.14 -> 2.36.15 --- pkgs/by-name/sp/spicetify-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sp/spicetify-cli/package.nix b/pkgs/by-name/sp/spicetify-cli/package.nix index a2578f6687a0..b393ff872324 100644 --- a/pkgs/by-name/sp/spicetify-cli/package.nix +++ b/pkgs/by-name/sp/spicetify-cli/package.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "spicetify-cli"; - version = "2.36.14"; + version = "2.36.15"; src = fetchFromGitHub { owner = "spicetify"; repo = "cli"; rev = "v${version}"; - hash = "sha256-F5fXTkUbpVwscM2GwMA/hSpe0ZVQU12Jb8I8dxuRzYc="; + hash = "sha256-K3lhPeW6L9N9OljNn8e6iQqx4k4HX5A9mX7SUlv2IRw="; }; - vendorHash = "sha256-po0ZrIXtyK0txK+eWGZDEIGMI1/cwyLVsGUVnTaHKP0="; + vendorHash = "sha256-i3xnf440lslzeDJ4pLLONqw8ACbdkKgPIhlPSuC1Vng="; ldflags = [ "-s -w" From 00ce48f891e19183abac158ed294312f79f7e9c6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 04:47:26 +0000 Subject: [PATCH 088/206] malwoverview: 5.4.5 -> 6.0.0 --- pkgs/by-name/ma/malwoverview/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ma/malwoverview/package.nix b/pkgs/by-name/ma/malwoverview/package.nix index 02a5fc015162..664c99eeede9 100644 --- a/pkgs/by-name/ma/malwoverview/package.nix +++ b/pkgs/by-name/ma/malwoverview/package.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "malwoverview"; - version = "5.4.5"; + version = "6.0.0"; pyproject = true; src = fetchFromGitHub { owner = "alexandreborges"; repo = "malwoverview"; rev = "refs/tags/v${version}"; - hash = "sha256-8miPlWBQSOf153l70C4Ya7gWF6D/gTArzJ5FyR0nVwA="; + hash = "sha256-qwNWYwMkxnRczqc4QvniuqwDVgpSlNTVOpzbzYcoMFg="; }; pythonRemoveDeps = [ From 520a05e8630e1195fa1b170db2f7866d5a56b340 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Fri, 19 Jul 2024 10:32:50 +0530 Subject: [PATCH 089/206] just: 1.31.0 -> 1.32.0 Diff: https://github.com/casey/just/compare/refs/tags/1.31.0...1.32.0 Changelog: https://github.com/casey/just/blob/1.32.0/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/by-name/ju/just/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 809d03ba7d60..cdf4146a0315 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -12,17 +12,17 @@ rustPlatform.buildRustPackage rec { pname = "just"; - version = "1.31.0"; + version = "1.32.0"; outputs = [ "out" "man" "doc" ]; src = fetchFromGitHub { owner = "casey"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-ljn51K3/reWxUy26XAUXNNRqiFgKMXTA5jX/kuKukqI="; + hash = "sha256-4W0Ft4wM2iLeepqg9XnHV/uejJEE9gIBOwm7axnC8bo="; }; - cargoHash = "sha256-cIoAYJw+wVwmBXy6ltcc3ImRCiRRv84C1iA/Bdf3tzE="; + cargoHash = "sha256-kjvc87HKMoKWImeAMiESb7xHuA+znX5z6MsWu6ThrhE="; nativeBuildInputs = [ installShellFiles mdbook ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; From 28379a75703426920e6ddb8674f5311aa90f5068 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 05:38:45 +0000 Subject: [PATCH 090/206] quark-engine: 24.6.1 -> 24.7.1 --- pkgs/tools/security/quark-engine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/quark-engine/default.nix b/pkgs/tools/security/quark-engine/default.nix index b2325c0a9a69..c27088c50d78 100644 --- a/pkgs/tools/security/quark-engine/default.nix +++ b/pkgs/tools/security/quark-engine/default.nix @@ -7,14 +7,14 @@ python3.pkgs.buildPythonApplication rec { pname = "quark-engine"; - version = "24.6.1"; + version = "24.7.1"; pyproject = true; src = fetchFromGitHub { owner = "quark-engine"; repo = "quark-engine"; rev = "refs/tags/v${version}"; - hash = "sha256-DDtDNa/QZ5n5ASN6Fu/nnVEQ/9Vu5HSKXKvbrg6Bsjs="; + hash = "sha256-Tk+pp6Bvc+fcrFp78UQCPLA/svMJIJ4FQlJ6D9jkMqg="; }; build-system = with python3.pkgs; [ setuptools ]; From 757de6e565a7c82e83b61b26185cd1a1b23ec62c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 05:55:25 +0000 Subject: [PATCH 091/206] python312Packages.dbt-redshift: 1.8.0 -> 1.8.1 --- pkgs/development/python-modules/dbt-redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dbt-redshift/default.nix b/pkgs/development/python-modules/dbt-redshift/default.nix index b818182d13b0..deffc3b313d1 100644 --- a/pkgs/development/python-modules/dbt-redshift/default.nix +++ b/pkgs/development/python-modules/dbt-redshift/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dbt-redshift"; - version = "1.8.0"; + version = "1.8.1"; pyproject = true; disabled = pythonOlder "3.10"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "dbt-labs"; repo = "dbt-redshift"; rev = "refs/tags/v${version}"; - hash = "sha256-XTAWCJ+aTFrAuggS3dbR9X08/x9ypXgE8tlWTaOmyRc="; + hash = "sha256-SmFN1GXX14L+3jtAo5Vqm53HLRaear2U/KI2Afx0ztU="; }; pythonRelaxDeps = [ From 149e8a8e6f2b11ec170b0c285675cbc89201ad86 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 05:56:14 +0000 Subject: [PATCH 092/206] mill: 0.11.8 -> 0.11.9 --- pkgs/development/tools/build-managers/mill/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mill/default.nix b/pkgs/development/tools/build-managers/mill/default.nix index 0aa0609ed2c7..2878fcb20d57 100644 --- a/pkgs/development/tools/build-managers/mill/default.nix +++ b/pkgs/development/tools/build-managers/mill/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "mill"; - version = "0.11.8"; + version = "0.11.9"; src = fetchurl { url = "https://github.com/com-lihaoyi/mill/releases/download/${finalAttrs.version}/${finalAttrs.version}-assembly"; - hash = "sha256-HORTexIzrxbWjcGrS59JqZboxGCzk8wKf3eKMoYGqrI="; + hash = "sha256-PjwqQziWOKCO9G1Cw3SiOvdgnc01cBzgyRlOiTA8u4A="; }; nativeBuildInputs = [ makeWrapper ]; From 1c53140edf18c916857e2408d98c380fc434000c Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Fri, 19 Jul 2024 08:12:04 +0200 Subject: [PATCH 093/206] vscode-extensions.streetsidesoftware.code-spell-checker: 4.0.3 -> 4.0.4 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 66b3362cc9c4..8625d12e0889 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -4354,8 +4354,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "4.0.3"; - hash = "sha256-CEGwbw5RpFsfB/g2inScIqWB7/3oxgxz7Yuc6V3OiHg="; + version = "4.0.4"; + hash = "sha256-WbEhTIuPqH77IuEDgjPUz9chHM/aYjMdpCI9Kf0KS2Q="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From 7c70994eb4d63f4e26890d54b68488919ffca19a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 07:02:54 +0000 Subject: [PATCH 094/206] ncspot: 1.1.1 -> 1.1.2 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index d5abb66d2398..4053a1a88f6b 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -20,16 +20,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - hash = "sha256-Sl4i9HFl+Dth9jmW6hPZzgh0Y35pRo1Xi9LRxCuSIP4="; + hash = "sha256-Lt2IuoiXYgSVPi4u8y16u9m5ya4HdpQme6snvNJrwso="; }; - cargoHash = "sha256-INgDavtBI75h+qVlxTncYu3su+SH/D7HTlThRHJzwkY="; + cargoHash = "sha256-JJTnaq0JLWHQxAbDpzDRPi5B+ePlQNlDOAsugPah7j4="; nativeBuildInputs = [ pkg-config ] ++ lib.optional withClipboard python3; From 6f788c72ccf84a5a03f89059504276927a431e54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 07:03:37 +0000 Subject: [PATCH 095/206] twitch-cli: 1.1.23 -> 1.1.24 --- pkgs/development/tools/twitch-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/twitch-cli/default.nix b/pkgs/development/tools/twitch-cli/default.nix index 2aa819a0a4dd..c8dbc9b42d14 100644 --- a/pkgs/development/tools/twitch-cli/default.nix +++ b/pkgs/development/tools/twitch-cli/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "twitch-cli"; - version = "1.1.23"; + version = "1.1.24"; src = fetchFromGitHub { owner = "twitchdev"; repo = pname; rev = "v${version}"; - hash = "sha256-BAVnXxkUXCKYq5hCPRtZu33andYm2ic4Vbx9an0MwFw="; + hash = "sha256-kRyJl2SxppVGCO/6wrsb8cO+wpBT1nBsyI/JsPRYzMc="; }; patches = [ From 88ef509488f2fcd9ec7558bdd429b87d7a406c7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 07:12:50 +0000 Subject: [PATCH 096/206] python312Packages.qbittorrent-api: 2024.5.63 -> 2024.7.64 --- pkgs/development/python-modules/qbittorrent-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qbittorrent-api/default.nix b/pkgs/development/python-modules/qbittorrent-api/default.nix index 58043ccccd51..920c3e08c4a7 100644 --- a/pkgs/development/python-modules/qbittorrent-api/default.nix +++ b/pkgs/development/python-modules/qbittorrent-api/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "qbittorrent-api"; - version = "2024.5.63"; + version = "2024.7.64"; pyproject = true; src = fetchPypi { pname = "qbittorrent_api"; inherit version; - hash = "sha256-zTAS8EL7lOnVIcQGttxSJgDv0YFNSy08kAxoEOn8viw="; + hash = "sha256-tHYoM4f6EfEX6LXhqHXPvYtiqd8WDFwwzkE0/A8CwmM="; }; propagatedBuildInputs = [ From 646e8f0ed45c8703453e5b83990bab67571b76e5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 07:54:56 +0000 Subject: [PATCH 097/206] python312Packages.python-docs-theme: 2024.4 -> 2024.6 --- pkgs/development/python-modules/python-docs-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-docs-theme/default.nix b/pkgs/development/python-modules/python-docs-theme/default.nix index 8ac3ce796799..012157d46507 100644 --- a/pkgs/development/python-modules/python-docs-theme/default.nix +++ b/pkgs/development/python-modules/python-docs-theme/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "python-docs-theme"; - version = "2024.4"; + version = "2024.6"; pyproject = true; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "python"; repo = "python-docs-theme"; rev = "refs/tags/${version}"; - hash = "sha256-x1r71/Urpqf0FtL2Bao5SgsRQfmwym34F7qYzxFkT5c="; + hash = "sha256-YKKF2e1La8jsCRS3M+LT+KmK0HxCRGQOof3MlVkMAuY="; }; nativeBuildInputs = [ flit-core ]; From 8c91869349040180dddcaa14c7cfdd9155555da1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 08:04:31 +0000 Subject: [PATCH 098/206] tailwindcss-language-server: 0.0.20 -> 0.0.21 --- pkgs/by-name/ta/tailwindcss-language-server/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ta/tailwindcss-language-server/package.nix b/pkgs/by-name/ta/tailwindcss-language-server/package.nix index bd34aa578509..06865660f79c 100644 --- a/pkgs/by-name/ta/tailwindcss-language-server/package.nix +++ b/pkgs/by-name/ta/tailwindcss-language-server/package.nix @@ -9,7 +9,7 @@ }: let - version = "0.0.20"; + version = "0.0.21"; in buildNpmPackage { pname = "tailwindcss-language-server"; @@ -19,11 +19,11 @@ buildNpmPackage { owner = "tailwindlabs"; repo = "tailwindcss-intellisense"; rev = "@tailwindcss/language-server@v${version}"; - hash = "sha256-MKJHRJPDivq/TDQUEI8usKxDeNkVondotjo+gZiz9n0="; + hash = "sha256-LMQ+HA74Y0n65JMO9LqCHbDVRiu4dIUvQofFTA03pWU="; }; makeCacheWritable = true; - npmDepsHash = "sha256-DYK7/gfZPKiSYG9IFPUnxhscxGooSUTdG1wFihFY/vA="; + npmDepsHash = "sha256-T7YNHunncSv+z86Td1QuBt4dMGF1ipo85ZhW7U9I0Zw="; npmWorkspace = "packages/tailwindcss-language-server"; buildInputs = [ libsecret ] ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ Security AppKit ]); From 7247d40e155e2568e1d690c94aa7a8dca5a33072 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 08:37:40 +0000 Subject: [PATCH 099/206] nile: 1.0.3-unstable-2024-06-08 -> 1.1.0-unstable-2024-07-15 --- pkgs/games/nile/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/nile/default.nix b/pkgs/games/nile/default.nix index f52c1ecb1f1f..e53f3b61720c 100644 --- a/pkgs/games/nile/default.nix +++ b/pkgs/games/nile/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "nile"; - version = "1.0.3-unstable-2024-06-08"; + version = "1.1.0-unstable-2024-07-15"; format = "pyproject"; src = fetchFromGitHub { owner = "imLinguin"; repo = "nile"; - rev = "fcf57a69d6f322e389a8c21b77215a488fa81132"; - hash = "sha256-zRuWJ0ziKxxOpGyR2IB8LncIFveIyz5PWYXhEHhQEM8="; + rev = "55287cd81b7993e9ed86e5efb9d71566de02bd40"; + hash = "sha256-sobhVggh8/BuKZWh39T0VJxg6kqADbC4AzeA32FQWN0="; }; disabled = pythonOlder "3.8"; From beac2c39d0a9324691fe2de182368959a2e3777e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 08:47:20 +0000 Subject: [PATCH 100/206] deck: 1.39.2 -> 1.39.3 --- pkgs/applications/networking/deck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/deck/default.nix b/pkgs/applications/networking/deck/default.nix index 3aa7b3106258..d57e11209b30 100644 --- a/pkgs/applications/networking/deck/default.nix +++ b/pkgs/applications/networking/deck/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "deck"; - version = "1.39.2"; + version = "1.39.3"; src = fetchFromGitHub { owner = "Kong"; repo = "deck"; rev = "v${version}"; - hash = "sha256-8Z2JBxVUoJKzxdMvyZg5SxHyIFW9lyA71GU7R6S27Rs="; + hash = "sha256-Oi/2sIsnJp1wK9PCS4GMCnFPLIAwNZeP7Qnnum3a118="; }; nativeBuildInputs = [ installShellFiles ]; From 20014a95f60308bc38e0582259c712507d7d94c9 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 11:56:41 +0200 Subject: [PATCH 101/206] libressl,libressl_3_8: Fix build for ppc64 --- .../development/libraries/libressl/default.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index f8350f7c4a53..9629c0e961a9 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -127,10 +127,28 @@ in { libressl_3_8 = generic { version = "3.8.4"; hash = "sha256-wM75z+F0rDZs5IL1Qv3bB3Ief6DK+s40tJqHIPo3/n0="; + + patches = [ + # Fixes build on ppc64 + # https://github.com/libressl/portable/pull/1073 + (fetchpatch { + url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch"; + hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw="; + }) + ]; }; libressl_3_9 = generic { version = "3.9.2"; hash = "sha256-ewMdrGSlnrbuMwT3/7ddrTOrjJ0nnIR/ksifuEYGj5c="; + + patches = [ + # Fixes build on ppc64 + # https://github.com/libressl/portable/pull/1073 + (fetchpatch { + url = "https://github.com/libressl/portable/commit/e6c7de3f03c51fbdcf5ad88bf12fe9e128521f0d.patch"; + hash = "sha256-LJy3fjbnc9h5DG3/+8bLECwJeBpPxy3hU8sPuhovmcw="; + }) + ]; }; } From 1cbd07c4e6cca50e6244c2ec373d19d4d0d6a98a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:02:20 +0300 Subject: [PATCH 102/206] koboldcpp: backport old interfaces Refs: https://github.com/NixOS/nixpkgs/pull/327102#discussion_r1677136308 Refs: https://github.com/NixOS/nixpkgs/pull/327102#discussion_r1677136419 Refs: https://github.com/NixOS/nixpkgs/pull/327102#discussion_r1677137201 Co-authored-by: SomeoneSerge --- pkgs/by-name/ko/koboldcpp/package.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 23b0f21bdac8..db7894de9b2e 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -5,6 +5,7 @@ makeWrapper, gitUpdater, python3Packages, + python311Packages ? null, # Ignored. Kept for compatibility with the release tk, addDriverRunpath, @@ -31,6 +32,8 @@ vulkan-loader, metalSupport ? stdenv.isDarwin && stdenv.isAarch64, + march ? "", + mtune ? "", }: let @@ -106,6 +109,14 @@ effectiveStdenv.mkDerivation (finalAttrs: { env.NIX_LDFLAGS = lib.concatStringsSep " " (finalAttrs.darwinLdFlags ++ finalAttrs.metalLdFlags); + env.NIX_CFLAGS_COMPILE = + lib.optionalString (march != "") ( + lib.warn "koboldcpp: the march argument is only kept for compatibility; use overrideAttrs intead" "-march=${march}" + ) + + lib.optionalString (mtune != "") ( + lib.warn "koboldcpp: the mtune argument is only kept for compatibility; use overrideAttrs intead" "-mtune=${mtune}" + ); + makeFlags = [ (makeBool "LLAMA_OPENBLAS" openblasSupport) (makeBool "LLAMA_CUBLAS" cublasSupport) From 50336ef94e87a13b0cba82d7381c1a85373bc1e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 11:03:35 +0000 Subject: [PATCH 103/206] minify: 2.20.35 -> 2.20.37 --- pkgs/development/web/minify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/minify/default.nix b/pkgs/development/web/minify/default.nix index bff154879034..9227793f506a 100644 --- a/pkgs/development/web/minify/default.nix +++ b/pkgs/development/web/minify/default.nix @@ -9,13 +9,13 @@ buildGoModule rec { pname = "minify"; - version = "2.20.35"; + version = "2.20.37"; src = fetchFromGitHub { owner = "tdewolff"; repo = pname; rev = "v${version}"; - hash = "sha256-eSU+AxCy7FIfMfKJXb3x4Iv1T7IgU0EHwDKHEBOW674="; + hash = "sha256-sBq1RlvyTelPS3gUgucWnyKV93npxvHetB4ezxnhIbU="; }; vendorHash = "sha256-LT39GYDcFL3hjiYwvbSYjV8hcg0KNgQmLMRWcdz4T48="; From 81f62b817fd57f6f51512218576adf78f581d627 Mon Sep 17 00:00:00 2001 From: Tom Herbers Date: Fri, 19 Jul 2024 13:07:47 +0200 Subject: [PATCH 104/206] yanic: set version variable during build Setting this allows `yanic version` to report the package version. --- pkgs/by-name/ya/yanic/package.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/by-name/ya/yanic/package.nix b/pkgs/by-name/ya/yanic/package.nix index 4784d98dccc3..cf314e90a575 100644 --- a/pkgs/by-name/ya/yanic/package.nix +++ b/pkgs/by-name/ya/yanic/package.nix @@ -17,7 +17,11 @@ buildGoModule rec { vendorHash = "sha256-6UiiajKLzW5e7y0F6GMYDZP6xTyOiccLIKlwvOY7LRo="; - ldflags = [ "-s" "-w" ]; + ldflags = [ + "-X github.com/FreifunkBremen/yanic/cmd.VERSION=${version}" + "-s" + "-w" + ]; nativeBuildInputs = [ installShellFiles ]; From 201ee231068c2353497a3d73b99c22ff0f83f769 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:18:32 +0300 Subject: [PATCH 105/206] koboldcpp: fix x86_64-darwin build Refs: https://github.com/NixOS/nixpkgs/pull/327102/checks?check_run_id=27511352788 --- pkgs/by-name/ko/koboldcpp/package.nix | 28 ++++++++++++++++----------- 1 file changed, 17 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index db7894de9b2e..79821a3838a8 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -43,6 +43,12 @@ let --prefix LD_LIBRARY_PATH: "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}" ''; + darwinFrameworks = + if (stdenv.isDarwin && stdenv.isx86_64) then + darwin.apple_sdk.frameworks + else + darwin.apple_sdk_11_0.frameworks; + effectiveStdenv = if cublasSupport then cudaPackages.backendStdenv else stdenv; in effectiveStdenv.mkDerivation (finalAttrs: { @@ -69,15 +75,15 @@ effectiveStdenv.mkDerivation (finalAttrs: { [ tk ] ++ finalAttrs.pythonInputs ++ lib.optionals effectiveStdenv.isDarwin [ - darwin.apple_sdk_11_0.frameworks.Accelerate - darwin.apple_sdk_11_0.frameworks.CoreVideo - darwin.apple_sdk_11_0.frameworks.CoreGraphics - darwin.apple_sdk_11_0.frameworks.CoreServices + darwinFrameworks.Accelerate + darwinFrameworks.CoreVideo + darwinFrameworks.CoreGraphics + darwinFrameworks.CoreServices ] ++ lib.optionals metalSupport [ - darwin.apple_sdk_11_0.frameworks.MetalKit - darwin.apple_sdk_11_0.frameworks.Foundation - darwin.apple_sdk_11_0.frameworks.MetalPerformanceShaders + darwinFrameworks.MetalKit + darwinFrameworks.Foundation + darwinFrameworks.MetalPerformanceShaders ] ++ lib.optionals openblasSupport [ openblas ] ++ lib.optionals cublasSupport [ @@ -95,14 +101,14 @@ effectiveStdenv.mkDerivation (finalAttrs: { pythonPath = finalAttrs.pythonInputs; darwinLdFlags = lib.optionals stdenv.isDarwin [ - "-F${darwin.apple_sdk_11_0.frameworks.CoreServices}/Library/Frameworks" - "-F${darwin.apple_sdk_11_0.frameworks.Accelerate}/Library/Frameworks" + "-F${darwinFrameworks.CoreServices}/Library/Frameworks" + "-F${darwinFrameworks.Accelerate}/Library/Frameworks" "-framework CoreServices" "-framework Accelerate" ]; metalLdFlags = lib.optionals metalSupport [ - "-F${darwin.apple_sdk_11_0.frameworks.Foundation}/Library/Frameworks" - "-F${darwin.apple_sdk_11_0.frameworks.Metal}/Library/Frameworks" + "-F${darwinFrameworks.Foundation}/Library/Frameworks" + "-F${darwinFrameworks.Metal}/Library/Frameworks" "-framework Foundation" "-framework Metal" ]; From cb6ea4729eec2d04495e54b8436ca7ee42996f46 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 19 Jul 2024 04:15:08 -0700 Subject: [PATCH 106/206] python312Packages.py-nextbusnext: 1.0.2 -> 2.0.3 Diff: https://github.com/ViViDboarder/py_nextbus/compare/refs/tags/v1.0.2...v2.0.3 Changelog: https://github.com/ViViDboarder/py_nextbusnext/releases/tag/v2.0.0 --- .../python-modules/py-nextbusnext/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/py-nextbusnext/default.nix b/pkgs/development/python-modules/py-nextbusnext/default.nix index 8aeae2b22b1f..ab889f86ff2c 100644 --- a/pkgs/development/python-modules/py-nextbusnext/default.nix +++ b/pkgs/development/python-modules/py-nextbusnext/default.nix @@ -2,31 +2,34 @@ lib, buildPythonPackage, fetchFromGitHub, - pytestCheckHook, pythonOlder, + requests, setuptools, }: buildPythonPackage rec { pname = "py-nextbusnext"; - version = "1.0.2"; + version = "2.0.3"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "ViViDboarder"; repo = "py_nextbus"; rev = "refs/tags/v${version}"; - hash = "sha256-5zD8AKb4/4x4cVA922OlzSOXlg3F6QCcr16agEQkUWM="; + hash = "sha256-dSBjOMqryEddWB54AddGDojRE8/STi3kxfjJsVFBuOw="; }; - nativeBuildInputs = [ setuptools ]; + build-system = [ setuptools ]; - nativeCheckInputs = [ pytestCheckHook ]; + dependencies = [ requests ]; pythonImportsCheck = [ "py_nextbus" ]; + # upstream has no tests + doCheck = false; + meta = with lib; { description = "Minimalistic Python client for the NextBus public API"; homepage = "https://github.com/ViViDboarder/py_nextbus"; From 269a863769cf470897f57c4115922e24c701a0c2 Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:19:28 +0300 Subject: [PATCH 107/206] koboldcpp: rename interface arches -> cudaArches Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1677129990 Co-authored-by: SomeoneSerge --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index 79821a3838a8..c096948565b0 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -22,7 +22,7 @@ cublasSupport ? config.cudaSupport, # You can find a full list here: https://arnon.dk/matching-sm-architectures-arch-and-gencode-for-various-nvidia-cards/ # For example if you're on an GTX 1080 that means you're using "Pascal" and you need to pass "sm_60" - arches ? cudaPackages.cudaFlags.arches or [ ], + cudaArches ? cudaPackages.cudaFlags.arches or [ ], clblastSupport ? stdenv.isLinux, clblast, @@ -129,7 +129,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (makeBool "LLAMA_CLBLAST" clblastSupport) (makeBool "LLAMA_VULKAN" vulkanSupport) (makeBool "LLAMA_METAL" metalSupport) - (lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head arches}") + (lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}") ]; installPhase = '' From 29a369911943263322cf298c1e6543cb5fa01f98 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 11:21:39 +0000 Subject: [PATCH 108/206] nanovna-saver: 0.6.3 -> 0.6.4 --- .../science/electronics/nanovna-saver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index dd58794ed182..8ab2ba14f663 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.6.3"; + version = "0.6.4"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-lL6n3hcsIbLmrRKPi/ckWW2XUAtmBqvMSplkWOF4VKQ="; + sha256 = "sha256-fAVsjknhLhsrGdHu2Q6JWLoFoxZoc+wDCNja+ySCsR4="; }; nativeBuildInputs = [ From fd54fe25e06e763cf15549a5877f808e0553450e Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:23:51 +0300 Subject: [PATCH 109/206] koboldcpp: lib.optionalString -> lib.optionals (cublasSupport) Refs: https://github.com/NixOS/nixpkgs/pull/325540#discussion_r1677129629 Co-authored-by: SomeoneSerge --- pkgs/by-name/ko/koboldcpp/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index c096948565b0..bc64a8d9e0fe 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -129,7 +129,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { (makeBool "LLAMA_CLBLAST" clblastSupport) (makeBool "LLAMA_VULKAN" vulkanSupport) (makeBool "LLAMA_METAL" metalSupport) - (lib.optionalString cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}") + (lib.optionals cublasSupport "CUDA_DOCKER_ARCH=sm_${builtins.head cudaArches}") ]; installPhase = '' From e04cfef691595a3953ee552700463c4e928fc13a Mon Sep 17 00:00:00 2001 From: DontEatOreo <57304299+DontEatOreo@users.noreply.github.com> Date: Fri, 19 Jul 2024 14:30:44 +0300 Subject: [PATCH 110/206] koboldcpp: makeWrapperArgs -> libraryPathWrapperArgs `makeWrapperArgs` was quite ambiguous and unclear. `libraryPathWrapperArgs` is clearer on what it's supposed to actually do --- pkgs/by-name/ko/koboldcpp/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ko/koboldcpp/package.nix b/pkgs/by-name/ko/koboldcpp/package.nix index bc64a8d9e0fe..ae0e441ce434 100644 --- a/pkgs/by-name/ko/koboldcpp/package.nix +++ b/pkgs/by-name/ko/koboldcpp/package.nix @@ -39,7 +39,7 @@ let makeBool = option: bool: (if bool then "${option}=1" else ""); - makeWrapperArgs = lib.optionalString config.cudaSupport '' + libraryPathWrapperArgs = lib.optionalString config.cudaSupport '' --prefix LD_LIBRARY_PATH: "${lib.makeLibraryPath [ addDriverRunpath.driverLink ]}" ''; @@ -158,7 +158,7 @@ effectiveStdenv.mkDerivation (finalAttrs: { postFixup = '' wrapPythonProgramsIn "$out/bin" "$pythonPath" makeWrapper "$out/bin/koboldcpp.unwrapped" "$out/bin/koboldcpp" \ - --prefix PATH ${lib.makeBinPath [ tk ]} ${makeWrapperArgs} + --prefix PATH ${lib.makeBinPath [ tk ]} ${libraryPathWrapperArgs} ''; passthru.updateScript = gitUpdater { rev-prefix = "v"; }; From 77c6cd5d35965539def1d9ccd96e6b9bb0797bed Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Tue, 9 Jul 2024 22:52:21 +0200 Subject: [PATCH 111/206] flexget: 3.11.39 -> 3.11.40 Diff: https://github.com/Flexget/Flexget/compare/refs/tags/v3.11.39...v3.11.40 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.40 --- .../networking/flexget/default.nix | 40 ++++++++++++++----- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 5bdda1c1f4ef..dcf34e8da05d 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,7 +5,7 @@ python3.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.39"; + version = "3.11.40"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -13,7 +13,7 @@ python3.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-saNxs+Xdf6OTRRcMTceU8/ITcYzwtP8VqRKxsWyas+o="; + hash = "sha256-96f6NrU928BhhHZmA2vHIhOrczL6AifKvKcdxoV3ihI="; }; postPatch = '' @@ -27,24 +27,18 @@ python3.pkgs.buildPythonApplication rec { ]; dependencies = with python3.pkgs; [ - # See https://github.com/Flexget/Flexget/blob/master/requirements.txt + # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml apscheduler beautifulsoup4 - click colorama - commonmark feedparser guessit html5lib jinja2 jsonschema loguru - more-itertools - packaging - pendulum psutil pynzb - pyrsistent pyrss2gen python-dateutil pyyaml @@ -53,27 +47,51 @@ python3.pkgs.buildPythonApplication rec { rich rpyc sqlalchemy - typing-extensions # WebUI requirements cherrypy flask-compress flask-cors flask-login - flask-restful flask-restx flask + packaging pyparsing werkzeug zxcvbn + pendulum # Plugins requirements transmission-rpc + qbittorrent-api + deluge-client + cloudscraper + python-telegram-bot ]; pythonImportsCheck = [ "flexget" + "flexget.api.core.authentication" + "flexget.api.core.database" + "flexget.api.core.plugins" + "flexget.api.core.schema" + "flexget.api.core.server" + "flexget.api.core.tasks" + "flexget.api.core.user" + "flexget.components.thetvdb.api" + "flexget.components.tmdb.api" + "flexget.components.trakt.api" + "flexget.components.tvmaze.api" + "flexget.plugins.clients.aria2" + "flexget.plugins.clients.deluge" + "flexget.plugins.clients.nzbget" + "flexget.plugins.clients.pyload" + "flexget.plugins.clients.qbittorrent" + "flexget.plugins.clients.rtorrent" "flexget.plugins.clients.transmission" + "flexget.plugins.services.kodi_library" + "flexget.plugins.services.myepisodes" + "flexget.plugins.services.pogcal_acquired" ]; # ~400 failures From 6fce24ec9c0df8e4e1547086e6452c127f508107 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 19 Jul 2024 13:32:42 +0200 Subject: [PATCH 112/206] flexget: downgrade to python311 --- pkgs/applications/networking/flexget/default.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index dcf34e8da05d..a61a143aef81 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -1,9 +1,16 @@ { lib , python3 +, python311 , fetchFromGitHub }: -python3.pkgs.buildPythonApplication rec { +let + python = if (builtins.tryEval python3.pkgs.nose.outPath).success + then python3 + else python311; +in + +python.pkgs.buildPythonApplication rec { pname = "flexget"; version = "3.11.40"; pyproject = true; @@ -21,12 +28,12 @@ python3.pkgs.buildPythonApplication rec { sed 's/[~<>=][^;]*//' -i requirements.txt ''; - build-system = with python3.pkgs; [ + build-system = with python.pkgs; [ setuptools wheel ]; - dependencies = with python3.pkgs; [ + dependencies = with python.pkgs; [ # See https://github.com/Flexget/Flexget/blob/master/pyproject.toml apscheduler beautifulsoup4 From 3b2f19accf9fa07bf108ba06884eb920aa97d019 Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 19 Jul 2024 13:35:59 +0200 Subject: [PATCH 113/206] flexget: 3.11.40 -> 3.11.41 Changelog: https://github.com/Flexget/Flexget/releases/tag/v3.11.41 --- pkgs/applications/networking/flexget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index a61a143aef81..26ea275144a7 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -12,7 +12,7 @@ in python.pkgs.buildPythonApplication rec { pname = "flexget"; - version = "3.11.40"; + version = "3.11.41"; pyproject = true; # Fetch from GitHub in order to use `requirements.in` @@ -20,7 +20,7 @@ python.pkgs.buildPythonApplication rec { owner = "Flexget"; repo = "Flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-96f6NrU928BhhHZmA2vHIhOrczL6AifKvKcdxoV3ihI="; + hash = "sha256-ZSqkD53fdDnKulVPgM9NWXVFXDR0sZ94mRyV1iKS87o="; }; postPatch = '' From 9d0712a7b35004493452ca95a4e5581c4a2bfc9e Mon Sep 17 00:00:00 2001 From: Peder Bergebakken Sundt Date: Fri, 19 Jul 2024 13:38:22 +0200 Subject: [PATCH 114/206] flexget: migrate to by-name --- .../flexget/default.nix => by-name/fl/flexget/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/networking/flexget/default.nix => by-name/fl/flexget/package.nix} (100%) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/by-name/fl/flexget/package.nix similarity index 100% rename from pkgs/applications/networking/flexget/default.nix rename to pkgs/by-name/fl/flexget/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f6876296c4f9..0d2695e0d2bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30306,8 +30306,6 @@ with pkgs; flamp = callPackage ../applications/radio/flamp { }; - flexget = callPackage ../applications/networking/flexget { }; - fldigi = callPackage ../applications/radio/fldigi { hamlib = hamlib_4; }; From 0667d917050a200360b3a531e3ce96a6e1131bd4 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 19 Jul 2024 08:33:39 -0400 Subject: [PATCH 115/206] maintainers: fix adamcstephens matrix --- maintainers/maintainer-list.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f92e6a3b8007..87051d27b230 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -485,7 +485,7 @@ }; adamcstephens = { email = "happy.plan4249@valkor.net"; - matrix = "@adam:valkor.net"; + matrix = "@adam:robins.wtf"; github = "adamcstephens"; githubId = 2071575; name = "Adam C. Stephens"; From 1a3545dbce079f0e8b5da45c8d060755de76b396 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 12:39:16 +0000 Subject: [PATCH 116/206] graphite-gtk-theme: 2024-04-28 -> 2024-07-15 --- pkgs/data/themes/graphite-gtk-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/graphite-gtk-theme/default.nix b/pkgs/data/themes/graphite-gtk-theme/default.nix index 5fadc70d1181..e0edd1f76d92 100644 --- a/pkgs/data/themes/graphite-gtk-theme/default.nix +++ b/pkgs/data/themes/graphite-gtk-theme/default.nix @@ -27,13 +27,13 @@ lib.checkListOfEnum "${pname}: grub screens" [ "1080p" "2k" "4k" ] grubScreens stdenvNoCC.mkDerivation rec { inherit pname; - version = "2024-04-28"; + version = "2024-07-15"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - hash = "sha256-7P8dTPk0LwXU3e44TeechCNsxtzw+w01B56IWtCUcCI="; + hash = "sha256-k93l/7DF0HSKPfiIxzBLz0mBflgbdYJyGLEmWZx3q7o="; }; nativeBuildInputs = [ From 58111a1c3b4933094f90da4b4c10e05be58c78ea Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 19 Jul 2024 08:40:51 -0400 Subject: [PATCH 117/206] CODEOWNERS: remove migrated lxc path --- .github/CODEOWNERS | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS index e2bd963249bc..5b19f29f2611 100644 --- a/.github/CODEOWNERS +++ b/.github/CODEOWNERS @@ -371,7 +371,6 @@ nixos/tests/lxd/ @adamcstephens pkgs/by-name/in/incus/ @adamcstephens pkgs/by-name/lx/lxc* @adamcstephens pkgs/by-name/lx/lxd* @adamcstephens -pkgs/os-specific/linux/lxc/ @adamcstephens # ExpidusOS, Flutter /pkgs/development/compilers/flutter @RossComputerGuy From 96e47a3676eab57182bc02eb39228c8fc48faff9 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 19 Jul 2024 08:41:03 -0400 Subject: [PATCH 118/206] just: remove adamcstephens as maintainer --- pkgs/by-name/ju/just/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/ju/just/package.nix b/pkgs/by-name/ju/just/package.nix index 809d03ba7d60..9a4d16e8e0db 100644 --- a/pkgs/by-name/ju/just/package.nix +++ b/pkgs/by-name/ju/just/package.nix @@ -99,7 +99,7 @@ rustPlatform.buildRustPackage rec { changelog = "https://github.com/casey/just/blob/${version}/CHANGELOG.md"; description = "Handy way to save and run project-specific commands"; license = licenses.cc0; - maintainers = with maintainers; [ xrelkd jk adamcstephens ]; + maintainers = with maintainers; [ xrelkd jk ]; mainProgram = "just"; }; } From a65001e9994e9c54ecd4c3e54f01b39c27834e2c Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 19 Jul 2024 08:42:04 -0400 Subject: [PATCH 119/206] zfs: move maintainer adamcstephens to 2.2 only --- pkgs/os-specific/linux/zfs/2_2.nix | 3 +++ pkgs/os-specific/linux/zfs/generic.nix | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/zfs/2_2.nix b/pkgs/os-specific/linux/zfs/2_2.nix index 14c88f195dbf..cc4a3490a197 100644 --- a/pkgs/os-specific/linux/zfs/2_2.nix +++ b/pkgs/os-specific/linux/zfs/2_2.nix @@ -1,6 +1,7 @@ { callPackage , kernel ? null , stdenv +, lib , linuxKernel , nixosTests , ... @@ -26,5 +27,7 @@ callPackage ./generic.nix args { nixosTests.zfs.series_2_2 ]; + maintainers = with lib.maintainers; [ adamcstephens amarshall ]; + hash = "sha256-SSp/1Tu1iGx5UDcG4j0k2fnYxK05cdE8gzfSn8DU5Z4="; } diff --git a/pkgs/os-specific/linux/zfs/generic.nix b/pkgs/os-specific/linux/zfs/generic.nix index ac32f034b7cd..3adcb97f6a69 100644 --- a/pkgs/os-specific/linux/zfs/generic.nix +++ b/pkgs/os-specific/linux/zfs/generic.nix @@ -30,7 +30,7 @@ let , isUnstable ? false , latestCompatibleLinuxPackages , kernelCompatible ? null - , maintainers ? (with lib.maintainers; [ amarshall adamcstephens ]) + , maintainers ? (with lib.maintainers; [ amarshall ]) , tests }@innerArgs: From dab6fd1b2a1816c9a71f4de629d1808e8ffde0af Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Fri, 19 Jul 2024 12:53:59 +0000 Subject: [PATCH 120/206] consul: 1.19.0 -> 1.19.1 --- pkgs/by-name/co/consul/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/co/consul/package.nix b/pkgs/by-name/co/consul/package.nix index 5dc8d88afe34..74f1ccbad672 100644 --- a/pkgs/by-name/co/consul/package.nix +++ b/pkgs/by-name/co/consul/package.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "consul"; - version = "1.19.0"; + version = "1.19.1"; # Note: Currently only release tags are supported, because they have the Consul UI # vendored. See @@ -22,7 +22,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-GO2BfdozsAo1r4iSyQdAEG8Tm6OkJhSUrH3bZ9lWuO8="; + hash = "sha256-UMKXI16QQHV9I+kH62KRbZCEcQLXkBwB6o/lqtCZa78="; }; # This corresponds to paths with package main - normally unneeded but consul @@ -32,7 +32,7 @@ buildGoModule rec { "connect/certgen" ]; - vendorHash = "sha256-h3eTCj/0FPiY/Dj4cMj9VqKBs28ArnTPjRIC3LT06j0="; + vendorHash = "sha256-l1+KVygh0TuvN45UmU/bXksjHBTZZ6jt54nZtR9f+II="; doCheck = false; From 69f2af5d55bf4dd8f11352eedda2cb7bc875607a Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 15:47:05 +0200 Subject: [PATCH 121/206] palemoon-bin: 33.2.0 -> 33.2.1 --- pkgs/applications/networking/browsers/palemoon/bin.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/palemoon/bin.nix b/pkgs/applications/networking/browsers/palemoon/bin.nix index fcd3b82f5092..49f6656c01ff 100644 --- a/pkgs/applications/networking/browsers/palemoon/bin.nix +++ b/pkgs/applications/networking/browsers/palemoon/bin.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation (finalAttrs: { pname = "palemoon-bin"; - version = "33.2.0"; + version = "33.2.1"; src = finalAttrs.passthru.sources."gtk${if withGTK3 then "3" else "2"}"; @@ -158,11 +158,11 @@ stdenv.mkDerivation (finalAttrs: { in { gtk3 = fetchzip { urls = urlRegionVariants "gtk3"; - hash = "sha256-h6ohLm9I6esvVa9bek/j2s/jiIcEOwjd8/dCyUvqyLw="; + hash = "sha256-GUizOnsjEq2UuRaBgjmsQLHuqnCt/MHFBb8lTHcwJOM="; }; gtk2 = fetchzip { urls = urlRegionVariants "gtk2"; - hash = "sha256-To/41og5hxFL6efJhNfRNJw/fOXZA5Le16DZsSJrXfc="; + hash = "sha256-RBEqBJNttuyMpeaC5scSY8Q2meZjgdeS2pppQ1n53uY="; }; }; From aa80dd4fc07b194e95485ae9ae09a4f4da47e0e8 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 19 Jul 2024 16:40:12 +0200 Subject: [PATCH 122/206] stalwart-mail: disable tests on aarch64 --- pkgs/by-name/st/stalwart-mail/package.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/by-name/st/stalwart-mail/package.nix b/pkgs/by-name/st/stalwart-mail/package.nix index 642c3823049c..871305321b1e 100644 --- a/pkgs/by-name/st/stalwart-mail/package.nix +++ b/pkgs/by-name/st/stalwart-mail/package.nix @@ -124,6 +124,8 @@ rustPlatform.buildRustPackage { "--skip=backend::sqlite::pool::SqliteConnectionManager::with_init" ]; + doCheck = !(stdenv.isLinux && stdenv.isAarch64); + passthru = { update-script = nix-update-script { }; tests.stalwart-mail = nixosTests.stalwart-mail; From 2b68ca0090d890516caeb8811f5d33370e1b2861 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Fri, 19 Jul 2024 16:42:22 +0200 Subject: [PATCH 123/206] mautrix-whatsapp: 0.10.7 -> 0.10.9 ChangeLogs: * https://github.com/mautrix/whatsapp/releases/tag/v0.10.8 * https://github.com/mautrix/whatsapp/releases/tag/v0.10.9 Closes #320405 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index f7108c69a535..d7bad1c9c79b 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.10.7"; + version = "0.10.9"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - hash = "sha256-GpeMzcWckh8q/Sh9YYV+qAdEvQ1XolhBw6+vgpACU20="; + hash = "sha256-iVILI6OGndnxIVmgNcIwHA64tkv9V3OTH3YtrCyeYx4="; }; buildInputs = [ olm ]; - vendorHash = "sha256-XhqrgRCW9HTPaTO9gMqDzEW22h53oprOYPAvMSGbcS4="; + vendorHash = "sha256-DpgkSXSLF+U6zIzJ4AF2uTcFWQQYsRgkaUTG9F+bnVk="; doCheck = false; From 1b2bb7a81a7816305707891f6bf1571f7dec6fc1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 15:09:49 +0000 Subject: [PATCH 124/206] obs-studio-plugins.obs-vkcapture: 1.5.0 -> 1.5.1 --- pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix index 385e5e4bc52d..b66d3d01b234 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-vkcapture.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "obs-vkcapture"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "nowrep"; repo = "obs-vkcapture"; rev = "v${finalAttrs.version}"; - hash = "sha256-hYPQ1N4k4eb+bvGWZqaQJ/C8C5Lh8ooZ03raGF5ORgE="; + hash = "sha256-RIDsT6eL6bUfqPiyPlecnZHu5OorcJb3Xal8pjdOpAA="; }; cmakeFlags = lib.optionals stdenv.isi686 [ From 194b0db036f5e840e6e648d21c34b65293286e99 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 15:20:52 +0000 Subject: [PATCH 125/206] gh-dash: 4.3.0 -> 4.4.0 --- pkgs/tools/misc/gh-dash/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/gh-dash/default.nix b/pkgs/tools/misc/gh-dash/default.nix index d9ca5eb8ae5c..9fd5298abf29 100644 --- a/pkgs/tools/misc/gh-dash/default.nix +++ b/pkgs/tools/misc/gh-dash/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gh-dash"; - version = "4.3.0"; + version = "4.4.0"; src = fetchFromGitHub { owner = "dlvhdr"; repo = "gh-dash"; rev = "v${version}"; - hash = "sha256-hH5GEVGwnX7i+WFrvHrt379CTQLeCiPQ/eLnQ5oVeec="; + hash = "sha256-HNGg3e6QoAkcio/78u2U1u0EhX707yXmA4fyGIqJHX0="; }; vendorHash = "sha256-JOd2czYWVgE1jBfeuoVRp+oE/asyk50o5Pf021jD5mY="; From 372fac0e5630120997c28283129c57ff9ff9379f Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jul 2024 11:57:20 +0300 Subject: [PATCH 126/206] chromedriver: use autoPatchelfHook, clean up deps --- .../tools/selenium/chromedriver/default.nix | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 41982c3d7d3e..1f9590ee5d1b 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,7 +1,5 @@ -{ lib, stdenv, fetchurl, unzip, makeWrapper -, cairo, fontconfig, freetype, gdk-pixbuf, glib -, glibc, gtk2, libX11, nspr, nss, pango -, libxcb, libXi, libXrender, libXext, dbus +{ lib, stdenv, fetchurl, unzip, autoPatchelfHook +, glib, nspr, nss, libxcb , testers, chromedriver }: @@ -26,16 +24,6 @@ let spec = allSpecs.${stdenv.hostPlatform.system} or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); - - libs = lib.makeLibraryPath [ - stdenv.cc.cc.lib - cairo fontconfig freetype - gdk-pixbuf glib gtk2 - libX11 nspr nss pango libXrender - libxcb libXext libXi - dbus - ]; - in stdenv.mkDerivation rec { pname = "chromedriver"; version = upstream-info.version; @@ -45,15 +33,13 @@ in stdenv.mkDerivation rec { hash = spec.hash; }; - nativeBuildInputs = [ unzip makeWrapper ]; - - unpackPhase = "unzip $src"; + nativeBuildInputs = [ unzip autoPatchelfHook ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ + glib nspr nss libxcb + ]; installPhase = '' - install -m755 -D "chromedriver-${spec.system}/chromedriver" $out/bin/chromedriver - '' + lib.optionalString (!stdenv.isDarwin) '' - patchelf --set-interpreter ${glibc.out}/lib/ld-linux-x86-64.so.2 $out/bin/chromedriver - wrapProgram "$out/bin/chromedriver" --prefix LD_LIBRARY_PATH : "${libs}" + install -m555 -D "chromedriver" $out/bin/chromedriver ''; passthru.tests.version = testers.testVersion { package = chromedriver; }; From 4919b62fde5fbeb9a5bc518d0edb813616f5b12e Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 17 Jul 2024 12:08:52 +0300 Subject: [PATCH 127/206] chromedriver: build from source where possible --- .../tools/selenium/chromedriver/binary.nix | 64 +++++++++++++++++ .../tools/selenium/chromedriver/default.nix | 68 ++----------------- .../tools/selenium/chromedriver/source.nix | 30 ++++++++ 3 files changed, 98 insertions(+), 64 deletions(-) create mode 100644 pkgs/development/tools/selenium/chromedriver/binary.nix create mode 100644 pkgs/development/tools/selenium/chromedriver/source.nix diff --git a/pkgs/development/tools/selenium/chromedriver/binary.nix b/pkgs/development/tools/selenium/chromedriver/binary.nix new file mode 100644 index 000000000000..d58dc30e5b15 --- /dev/null +++ b/pkgs/development/tools/selenium/chromedriver/binary.nix @@ -0,0 +1,64 @@ +{ lib, stdenv, fetchurl, autoPatchelfHook +, glib, nspr, nss, libxcb +, testers, chromedriver +}: + +let + upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver; + allSpecs = { + x86_64-linux = { + system = "linux64"; + hash = upstream-info.hash_linux; + }; + + x86_64-darwin = { + system = "mac-x64"; + hash = upstream-info.hash_darwin; + }; + + aarch64-darwin = { + system = "mac-arm64"; + hash = upstream-info.hash_darwin_aarch64; + }; + }; + + spec = allSpecs.${stdenv.hostPlatform.system} + or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); +in stdenv.mkDerivation rec { + pname = "chromedriver"; + version = upstream-info.version; + + src = fetchurl { + url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip"; + hash = spec.hash; + }; + + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = lib.optionals (!stdenv.isDarwin) [ + glib nspr nss libxcb + ]; + + installPhase = '' + install -m555 -D "chromedriver" $out/bin/chromedriver + ''; + + passthru.tests.version = testers.testVersion { package = chromedriver; }; + + meta = with lib; { + homepage = "https://chromedriver.chromium.org/"; + description = "WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. + ''; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + license = licenses.bsd3; + maintainers = with maintainers; [ goibhniu primeos ]; + # Note from primeos: By updating Chromium I also update Google Chrome and + # ChromeDriver. + platforms = attrNames allSpecs; + mainProgram = "chromedriver"; + }; +} diff --git a/pkgs/development/tools/selenium/chromedriver/default.nix b/pkgs/development/tools/selenium/chromedriver/default.nix index 1f9590ee5d1b..4d62e7b8692d 100644 --- a/pkgs/development/tools/selenium/chromedriver/default.nix +++ b/pkgs/development/tools/selenium/chromedriver/default.nix @@ -1,64 +1,4 @@ -{ lib, stdenv, fetchurl, unzip, autoPatchelfHook -, glib, nspr, nss, libxcb -, testers, chromedriver -}: - -let - upstream-info = (import ../../../../applications/networking/browsers/chromium/upstream-info.nix).stable.chromedriver; - allSpecs = { - x86_64-linux = { - system = "linux64"; - hash = upstream-info.hash_linux; - }; - - x86_64-darwin = { - system = "mac-x64"; - hash = upstream-info.hash_darwin; - }; - - aarch64-darwin = { - system = "mac-arm64"; - hash = upstream-info.hash_darwin_aarch64; - }; - }; - - spec = allSpecs.${stdenv.hostPlatform.system} - or (throw "missing chromedriver binary for ${stdenv.hostPlatform.system}"); -in stdenv.mkDerivation rec { - pname = "chromedriver"; - version = upstream-info.version; - - src = fetchurl { - url = "https://storage.googleapis.com/chrome-for-testing-public/${version}/${spec.system}/chromedriver-${spec.system}.zip"; - hash = spec.hash; - }; - - nativeBuildInputs = [ unzip autoPatchelfHook ]; - buildInputs = lib.optionals (!stdenv.isDarwin) [ - glib nspr nss libxcb - ]; - - installPhase = '' - install -m555 -D "chromedriver" $out/bin/chromedriver - ''; - - passthru.tests.version = testers.testVersion { package = chromedriver; }; - - meta = with lib; { - homepage = "https://chromedriver.chromium.org/"; - description = "WebDriver server for running Selenium tests on Chrome"; - longDescription = '' - WebDriver is an open source tool for automated testing of webapps across - many browsers. It provides capabilities for navigating to web pages, user - input, JavaScript execution, and more. ChromeDriver is a standalone - server that implements the W3C WebDriver standard. - ''; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.bsd3; - maintainers = with maintainers; [ goibhniu primeos ]; - # Note from primeos: By updating Chromium I also update Google Chrome and - # ChromeDriver. - platforms = attrNames allSpecs; - mainProgram = "chromedriver"; - }; -} +{ lib, stdenv, chromium, callPackage }: +if lib.meta.availableOn stdenv.hostPlatform chromium + then callPackage ./source.nix {} + else callPackage ./binary.nix {} diff --git a/pkgs/development/tools/selenium/chromedriver/source.nix b/pkgs/development/tools/selenium/chromedriver/source.nix new file mode 100644 index 000000000000..fcb22c406644 --- /dev/null +++ b/pkgs/development/tools/selenium/chromedriver/source.nix @@ -0,0 +1,30 @@ +{ chromium, testers, chromedriver }: +chromium.mkDerivation (_: { + name = "chromedriver"; + packageName = "chromedriver"; + + # Build the unstripped target, because stripping in Chromium relies on a prebuilt strip binary + # that doesn't run on NixOS, and we will strip everything ourselves later anyway. + buildTargets = [ "chromedriver.unstripped" ]; + + installPhase = '' + install -Dm555 $buildPath/chromedriver.unstripped $out/bin/chromedriver + ''; + + # Kill existing postFixup that tries to patchelf things + postFixup = null; + + passthru.tests.version = testers.testVersion { package = chromedriver; }; + + meta = chromium.meta // { + homepage = "https://chromedriver.chromium.org/"; + description = "WebDriver server for running Selenium tests on Chrome"; + longDescription = '' + WebDriver is an open source tool for automated testing of webapps across + many browsers. It provides capabilities for navigating to web pages, user + input, JavaScript execution, and more. ChromeDriver is a standalone + server that implements the W3C WebDriver standard. + ''; + mainProgram = "chromedriver"; + }; +}) From 859f3466f86783158dffbdc35d4a9b5cf4af2212 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Fri, 5 Jul 2024 23:03:03 +0300 Subject: [PATCH 128/206] python3Packages.undetected-chromedriver: init at 3.5.5 --- .../undetected-chromedriver/default.nix | 54 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/undetected-chromedriver/default.nix diff --git a/pkgs/development/python-modules/undetected-chromedriver/default.nix b/pkgs/development/python-modules/undetected-chromedriver/default.nix new file mode 100644 index 000000000000..bcb349bfe36d --- /dev/null +++ b/pkgs/development/python-modules/undetected-chromedriver/default.nix @@ -0,0 +1,54 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + + setuptools, + + looseversion, + requests, + selenium, + websockets, +}: + +buildPythonPackage { + pname = "undetected-chromedriver"; + version = "3.5.5"; + pyproject = true; + + src = fetchFromGitHub { + owner = "ultrafunkamsterdam"; + repo = "undetected-chromedriver"; + # Upstream uses the summaries of commits for specifying versions + rev = "0aa5fbe252370b4cb2b95526add445392cad27ba"; + hash = "sha256-Qe+GrsUPnhjJMDgjdUCloapjj0ggFlm/Dr42WLcmb1o="; + }; + + build-system = [ setuptools ]; + + dependencies = [ + looseversion + requests + selenium + websockets + ]; + + # No tests + doCheck = false; + + pythonImportsCheck = [ "undetected_chromedriver" ]; + + postPatch = '' + substituteInPlace undetected_chromedriver/patcher.py \ + --replace-fail \ + "from distutils.version import LooseVersion" \ + "from looseversion import LooseVersion" + ''; + + meta = with lib; { + description = "Python library for the custom Selenium ChromeDriver that passes all bot mitigation systems"; + homepage = "https://github.com/ultrafunkamsterdam/undetected-chromedriver"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ paveloom ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b31e805460b6..c0342015c5ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -16738,6 +16738,8 @@ self: super: with self; { undefined = callPackage ../development/python-modules/undefined { }; + undetected-chromedriver = callPackage ../development/python-modules/undetected-chromedriver { }; + unearth = callPackage ../development/python-modules/unearth { }; unicodecsv = callPackage ../development/python-modules/unicodecsv { }; From 6f69acaa23bfbcaa5d91723bb49f58a7924077e7 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Fri, 5 Jul 2024 23:05:04 +0300 Subject: [PATCH 129/206] undetected-chromedriver: init at 126.0.6478.126 --- .../un/undetected-chromedriver/package.nix | 44 +++++++++++++++++++ 1 file changed, 44 insertions(+) create mode 100644 pkgs/by-name/un/undetected-chromedriver/package.nix diff --git a/pkgs/by-name/un/undetected-chromedriver/package.nix b/pkgs/by-name/un/undetected-chromedriver/package.nix new file mode 100644 index 000000000000..3976f3cc685b --- /dev/null +++ b/pkgs/by-name/un/undetected-chromedriver/package.nix @@ -0,0 +1,44 @@ +{ + lib, + stdenv, + + chromedriver, + python3, + + testers, + undetected-chromedriver, +}: + +stdenv.mkDerivation { + pname = "undetected-chromedriver"; + inherit (chromedriver) version; + + nativeBuildInputs = [ (python3.withPackages (ps: [ ps.undetected-chromedriver ])) ]; + + buildCommand = '' + export HOME=$(mktemp -d) + + cp ${chromedriver}/bin/chromedriver . + chmod +w chromedriver + + python < Date: Fri, 19 Jul 2024 23:45:18 +0800 Subject: [PATCH 130/206] emacsPackages.isearch-plus: trivialBuild -> melpaBuild --- .../manual-packages/isearch-plus/default.nix | 21 +++++++++++-------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix index d4f60c609381..6c12d37664ae 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-plus/default.nix @@ -1,11 +1,12 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs +{ + lib, + melpaBuild, + fetchFromGitHub, }: -trivialBuild { +melpaBuild { pname = "isearch-plus"; + ename = "isearch+"; version = "3434-unstable-2021-08-23"; src = fetchFromGitHub { @@ -15,11 +16,13 @@ trivialBuild { hash = "sha256-kD+Fyps3fc5YK6ATU1nrkKHazGMYJnU2gRcpQZf6A1E="; }; - meta = with lib; { + meta = { homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Extensions to isearch"; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ leungbk AndersonTorres ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ + leungbk + AndersonTorres + ]; }; } From 643fd935913cdd910683d08046655ffcee7ae092 Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 19 Jul 2024 23:50:00 +0800 Subject: [PATCH 131/206] emacsPackages.isearch-prop: trivialBuild -> melpaBuild --- .../manual-packages/isearch-prop/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix index 00ff1f0a9b21..fb4cf005b08f 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/isearch-prop/default.nix @@ -1,10 +1,10 @@ -{ lib -, fetchFromGitHub -, trivialBuild -, emacs +{ + lib, + fetchFromGitHub, + melpaBuild, }: -trivialBuild { +melpaBuild { pname = "isearch-prop"; version = "0-unstable-2019-05-01"; @@ -15,11 +15,10 @@ trivialBuild { hash = "sha256-A1Kt4nm7iRV9J5yaLupwiNL5g7ddZvQs79dggmqZ7Rk="; }; - meta = with lib; { + meta = { homepage = "https://www.emacswiki.org/emacs/IsearchPlus"; description = "Search text- or overlay-property contexts"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ leungbk ]; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ leungbk ]; }; } From 140b20a5c6cf2aa57bfbcabe9a20554d7fc95e40 Mon Sep 17 00:00:00 2001 From: aleksana Date: Fri, 19 Jul 2024 21:11:15 +0800 Subject: [PATCH 132/206] alpaca: init at 0.9.6.1 --- .../al/alpaca/fix_xdg_path_flatpak.patch | 26 +++++ pkgs/by-name/al/alpaca/package.nix | 95 +++++++++++++++++++ 2 files changed, 121 insertions(+) create mode 100644 pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch create mode 100644 pkgs/by-name/al/alpaca/package.nix diff --git a/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch b/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch new file mode 100644 index 000000000000..ebb0a44e6575 --- /dev/null +++ b/pkgs/by-name/al/alpaca/fix_xdg_path_flatpak.patch @@ -0,0 +1,26 @@ +diff --git a/src/alpaca.in b/src/alpaca.in +index cb883c8..a9822cc 100755 +--- a/src/alpaca.in ++++ b/src/alpaca.in +@@ -35,7 +35,21 @@ locale.bindtextdomain('alpaca', localedir) + locale.textdomain('alpaca') + gettext.install('alpaca', localedir) + ++# Use the right XDG paths outside flatpak ++def set_xdg_path(env, default): ++ app_id = "com.jeffser.Alpaca" ++ base = os.getenv(env) or os.path.expanduser(default) ++ path = os.path.join(base, app_id) ++ if not os.path.exists(path): ++ os.makedirs(path) ++ os.environ[env] = path ++ return ++ + if __name__ == '__main__': ++ set_xdg_path("XDG_CONFIG_HOME", "~/.config") ++ set_xdg_path("XDG_DATA_HOME", "~/.local/share") ++ set_xdg_path("XDG_CACHE_HOME", "~/.cache") ++ + import gi + + from gi.repository import Gio diff --git a/pkgs/by-name/al/alpaca/package.nix b/pkgs/by-name/al/alpaca/package.nix new file mode 100644 index 000000000000..5ce7ce0b0261 --- /dev/null +++ b/pkgs/by-name/al/alpaca/package.nix @@ -0,0 +1,95 @@ +{ + lib, + python3Packages, + fetchFromGitHub, + fetchpatch, + appstream, + meson, + ninja, + pkg-config, + gobject-introspection, + wrapGAppsHook4, + desktop-file-utils, + libadwaita, + gtksourceview5, + xdg-utils, + ollama, +}: + +python3Packages.buildPythonApplication rec { + pname = "alpaca"; + version = "0.9.6.1"; + pyproject = false; # Built with meson + + src = fetchFromGitHub { + owner = "Jeffser"; + repo = "Alpaca"; + rev = version; + hash = "sha256-EbaEjKqfotJBceaYEyz3LHilK3GnnwEpfMR7Teq96hI="; + }; + + patches = [ + # Change the way XDG paths are handled so it makes sense outside of flatpak + ./fix_xdg_path_flatpak.patch + + # Let ollama instance stop gracefully so we don't have model instance left behind + (fetchpatch { + url = "https://github.com/Jeffser/Alpaca/commit/e81d918675896c1670cf5aa5a55e1b706be5ed51.patch"; + hash = "sha256-gYYFvaoBI/Qn0g2qgS1cB0B4F08swznrSd5KCb51vh0="; + }) + ]; + + postPatch = '' + substituteInPlace src/local_instance.py \ + --replace-fail '/app/bin/ollama' 'ollama' + ''; + + nativeBuildInputs = [ + appstream + meson + ninja + pkg-config + gobject-introspection + wrapGAppsHook4 + desktop-file-utils + ]; + + buildInputs = [ + libadwaita + gtksourceview5 + ]; + + dependencies = with python3Packages; [ + pygobject3 + requests + pillow + pypdf + ]; + + dontWrapGApps = true; + + makeWrapperArgs = [ + "\${gappsWrapperArgs[@]}" + "--prefix PATH : ${lib.makeBinPath [ xdg-utils ollama ]}" + # Declared but not used in src/window.py, for later reference + # https://github.com/flatpak/flatpak/issues/3229 + "--set FLATPAK_DEST ${placeholder "out"}" + ]; + + meta = { + description = "Ollama client made with GTK4 and Adwaita"; + longDescription = '' + To run Alpaca with GPU acceleration enabled, simply override it: + ```nix + pkgs.alpaca.override { + ollama = pkgs.ollama-cuda; + } + ``` + ''; + homepage = "https://jeffser.com/alpaca"; + license = lib.licenses.gpl3Plus; + mainProgram = "alpaca"; + maintainers = with lib.maintainers; [ aleksana ]; + platforms = lib.platforms.linux; + }; +} From c1114304a7b6bc318e1950969a33c7a5cefd3edb Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Fri, 19 Jul 2024 23:57:25 +0800 Subject: [PATCH 133/206] emacsPackages.rect-mark: trivialBuild -> melpaBuild --- .../manual-packages/rect-mark/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix index 8d4fcf5090c3..890893115b1c 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/rect-mark/default.nix @@ -1,24 +1,23 @@ -{ lib -, trivialBuild -, fetchFromGitHub -, emacs - }: +{ + lib, + melpaBuild, + fetchFromGitHub, +}: -trivialBuild rec { +melpaBuild rec { pname = "rect-mark"; version = "1.4"; src = fetchFromGitHub { owner = "emacsmirror"; - repo = pname; + repo = "rect-mark"; rev = version; hash = "sha256-/8T1VTYkKUxlNWXuuS54S5jpl4UxJBbgSuWc17a/VyM="; }; - meta = with lib; { + meta = { homepage = "http://emacswiki.org/emacs/RectangleMark"; description = "Mark a rectangle of text with highlighting"; - license = licenses.gpl2Plus; - inherit (emacs.meta) platforms; + license = lib.licenses.gpl2Plus; }; } From 079489e456f5bcd75863ae3410307e26e36c8e8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=A9clairevoyant?= <848000+eclairevoyant@users.noreply.github.com> Date: Fri, 12 Jul 2024 19:55:14 -0400 Subject: [PATCH 134/206] obs-studio: 30.1.2 -> 30.2.0 --- ...le-access-and-universal-access-for-file-URL.patch | 11 ++++------- pkgs/applications/video/obs-studio/default.nix | 11 +++++++---- .../video/obs-studio/fix-nix-plugin-path.patch | 12 ++++++------ 3 files changed, 17 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch index 49d01bacbd10..b0c9650ddb90 100644 --- a/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch +++ b/pkgs/applications/video/obs-studio/Enable-file-access-and-universal-access-for-file-URL.patch @@ -12,12 +12,12 @@ security model. 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/obs-browser-source.cpp b/obs-browser-source.cpp -index ab1181e..c775283 100644 +index 09b3017..1094340 100644 --- a/plugins/obs-browser/obs-browser-source.cpp +++ b/plugins/obs-browser/obs-browser-source.cpp -@@ -179,9 +179,12 @@ bool BrowserSource::CreateBrowser() +@@ -239,9 +239,12 @@ bool BrowserSource::CreateBrowser() - #if ENABLE_LOCAL_FILE_URL_SCHEME + #if ENABLE_LOCAL_FILE_URL_SCHEME && CHROME_VERSION_BUILD < 4430 if (is_local) { - /* Disable web security for file:// URLs to allow - * local content access to remote APIs */ @@ -30,7 +30,4 @@ index ab1181e..c775283 100644 + STATE_ENABLED; } #endif - --- -2.31.1 - + auto browser = CefBrowserHost::CreateBrowserSync( diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index d787ab91db1e..5a95f746ee2e 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -1,6 +1,8 @@ { config +, uthash , lib , stdenv +, nv-codec-headers-12 , fetchFromGitHub , fetchpatch , addOpenGLRunpath @@ -39,7 +41,6 @@ , withFdk ? true , pipewire , libdrm -, libajantv2 , librist , libva , srt @@ -62,13 +63,13 @@ in stdenv.mkDerivation (finalAttrs: { pname = "obs-studio"; - version = "30.1.2"; + version = "30.2.0"; src = fetchFromGitHub { owner = "obsproject"; repo = "obs-studio"; rev = finalAttrs.version; - hash = "sha256-M4IINBoYrgkM37ykb4boHyWP8AxwMX0b7IAeeNIw9Qo="; + hash = "sha256-mwh2KLSz+I/8f3i/wST/2vKL/hWTCTaq53sinIEX75M="; fetchSubmodules = true; }; @@ -113,7 +114,6 @@ stdenv.mkDerivation (finalAttrs: { libvlc mbedtls pciutils - libajantv2 librist libva srt @@ -124,6 +124,8 @@ stdenv.mkDerivation (finalAttrs: { libdatachannel libvpl qrcodegencpp + uthash + nv-codec-headers-12 ] ++ optionals scriptingSupport [ luajit python3 ] ++ optional alsaSupport alsa-lib @@ -155,6 +157,7 @@ stdenv.mkDerivation (finalAttrs: { (lib.cmakeBool "ENABLE_ALSA" alsaSupport) (lib.cmakeBool "ENABLE_PULSEAUDIO" pulseaudioSupport) (lib.cmakeBool "ENABLE_PIPEWIRE" pipewireSupport) + (lib.cmakeBool "ENABLE_AJA" false) # TODO: fix linking against libajantv2 ]; env.NIX_CFLAGS_COMPILE = toString [ diff --git a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch index baf45104e6a8..13569e8499b5 100644 --- a/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch +++ b/pkgs/applications/video/obs-studio/fix-nix-plugin-path.patch @@ -1,9 +1,9 @@ diff --git a/cmake/Modules/ObsDefaults_Linux.cmake b/cmake/Modules/ObsDefaults_Linux.cmake -index d1e58a083..a03c6b98e 100644 +index fe8d72364..1c590fcdb 100644 --- a/cmake/Modules/ObsDefaults_Linux.cmake +++ b/cmake/Modules/ObsDefaults_Linux.cmake @@ -76,7 +76,7 @@ macro(setup_obs_project) - set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/") + set(OBS_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}") set(OBS_DATA_PATH "${OBS_DATA_DESTINATION}") - set(OBS_SCRIPT_PLUGIN_PATH "${CMAKE_INSTALL_PREFIX}/${OBS_SCRIPT_PLUGIN_DESTINATION}") @@ -12,15 +12,15 @@ index d1e58a083..a03c6b98e 100644 else() set(OBS_EXECUTABLE_DESTINATION "bin/${_ARCH_SUFFIX}bit") diff --git a/libobs/obs-nix.c b/libobs/obs-nix.c -index b006a5598..531655eb3 100644 +index 77c36be5e..fe8a04813 100644 --- a/libobs/obs-nix.c +++ b/libobs/obs-nix.c -@@ -56,7 +56,7 @@ const char *get_module_extension(void) - #define FLATPAK_PLUGIN_PATH "/app/plugins" +@@ -51,7 +51,7 @@ const char *get_module_extension(void) static const char *module_bin[] = { + "../../obs-plugins/64bit", - OBS_INSTALL_PREFIX "/" OBS_PLUGIN_DESTINATION, + OBS_PLUGIN_DESTINATION, - "../../obs-plugins/" BIT_STRING, FLATPAK_PLUGIN_PATH "/" OBS_PLUGIN_DESTINATION, }; + From da35ec2c07f8dae7c3ddfd24f05cccda7ab8313a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 16:50:23 +0000 Subject: [PATCH 135/206] python312Packages.weaviate-client: 4.6.5 -> 4.6.7 --- pkgs/development/python-modules/weaviate-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/weaviate-client/default.nix b/pkgs/development/python-modules/weaviate-client/default.nix index fc9aa1050f51..4050296e5042 100644 --- a/pkgs/development/python-modules/weaviate-client/default.nix +++ b/pkgs/development/python-modules/weaviate-client/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "weaviate-client"; - version = "4.6.5"; + version = "4.6.7"; pyproject = true; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "weaviate"; repo = "weaviate-python-client"; rev = "refs/tags/v${version}"; - hash = "sha256-mlM3fzjKwWvIfqH3LxAiRL3MgqT6RbMuAUzzEwLhlZs="; + hash = "sha256-Y+KX9ZJhQgXGdweLtnh7vQO7U7WBvT9RR94ro9kw7qg="; }; pythonRelaxDeps = [ From dacbe420fbc1d32d27a63fe6fcfca6e74d4ad25d Mon Sep 17 00:00:00 2001 From: Konstantin Astafurov Date: Fri, 19 Jul 2024 12:58:24 -0400 Subject: [PATCH 136/206] chickenPackages.chickenEggs: format --- .../compilers/chicken/5/egg2nix.nix | 3 ++- .../compilers/chicken/5/eggDerivation.nix | 27 ++++++++++--------- .../compilers/chicken/5/overrides.nix | 3 ++- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/egg2nix.nix b/pkgs/development/compilers/chicken/5/egg2nix.nix index 3e2cc49a2669..dfef7c6cd236 100644 --- a/pkgs/development/compilers/chicken/5/egg2nix.nix +++ b/pkgs/development/compilers/chicken/5/egg2nix.nix @@ -16,7 +16,8 @@ eggDerivation { name = "egg2nix-${version}"; buildInputs = with chickenEggs; [ - args matchable + args + matchable ]; meta = { diff --git a/pkgs/development/compilers/chicken/5/eggDerivation.nix b/pkgs/development/compilers/chicken/5/eggDerivation.nix index 2d2462355928..05a51f7bf91a 100644 --- a/pkgs/development/compilers/chicken/5/eggDerivation.nix +++ b/pkgs/development/compilers/chicken/5/eggDerivation.nix @@ -1,18 +1,21 @@ { callPackage, lib, stdenv, chicken, makeWrapper }: -{ name, src -, buildInputs ? [] -, chickenInstallFlags ? [] -, cscOptions ? [] -, ...} @ args: +{ name +, src +, buildInputs ? [ ] +, chickenInstallFlags ? [ ] +, cscOptions ? [ ] +, ... +} @ args: let overrides = callPackage ./overrides.nix { }; baseName = lib.getName name; - override = if builtins.hasAttr baseName overrides - then - builtins.getAttr baseName overrides - else - lib.id; + override = + if builtins.hasAttr baseName overrides + then + builtins.getAttr baseName overrides + else + lib.id; in (stdenv.mkDerivation ({ name = "chicken-${name}"; @@ -52,5 +55,5 @@ in meta = { inherit (chicken.meta) platforms; - } // args.meta or {}; -} // builtins.removeAttrs args ["name" "buildInputs" "meta"]) ).overrideAttrs override + } // args.meta or { }; +} // builtins.removeAttrs args [ "name" "buildInputs" "meta" ])).overrideAttrs override diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index d29f52661bb7..f6c46c94006d 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -122,7 +122,8 @@ in taglib = old: (addToBuildInputs [ pkgs.zlib pkgs.taglib ] old) // ( # needed for tablib-config to be in PATH - addToNativeBuildInputs pkgs.taglib old); + addToNativeBuildInputs pkgs.taglib old + ); uuid-lib = addToBuildInputs pkgs.libuuid; ws-client = addToBuildInputs pkgs.zlib; xlib = addToPropagatedBuildInputs pkgs.xorg.libX11; From 9f61def816cc7b72ac50dae865497957e3de050b Mon Sep 17 00:00:00 2001 From: Konstantin Astafurov Date: Fri, 19 Jul 2024 13:01:16 -0400 Subject: [PATCH 137/206] chickenPackages.chickenEggs: fix allegro, dbus, math, and socket eggs --- .../compilers/chicken/5/overrides.nix | 41 +++++++++++++++++-- 1 file changed, 38 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index f6c46c94006d..5748897e0c74 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -25,8 +25,16 @@ let }; in { - allegro = addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd ] - ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ]); + allegro = old: + ((addToBuildInputsWithPkgConfig ([ pkgs.allegro5 pkgs.libglvnd pkgs.libGLU ] + ++ lib.optionals stdenv.isDarwin [ pkgs.darwin.apple_sdk.frameworks.OpenGL ] + ++ lib.optionals stdenv.isLinux [ pkgs.xorg.libX11 ])) old) // { + # depends on 'chicken' egg, which doesn't exist, + # so we specify all the deps here + propagatedBuildInputs = [ + chickenEggs.foreigners + ]; + }; breadline = addToBuildInputs pkgs.readline; blas = addToBuildInputsWithPkgConfig pkgs.blas; blosc = addToBuildInputs pkgs.c-blosc; @@ -35,7 +43,6 @@ in (addToBuildInputsWithPkgConfig pkgs.cairo old) // (addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 srfi-13 ]) old); cmark = addToBuildInputs pkgs.cmark; - dbus = addToBuildInputsWithPkgConfig pkgs.dbus; epoxy = old: (addToPropagatedBuildInputsWithPkgConfig pkgs.libepoxy old) // lib.optionalAttrs stdenv.cc.isClang { @@ -167,6 +174,34 @@ in pledge = addMetaAttrs { platforms = lib.platforms.openbsd; }; unveil = addMetaAttrs { platforms = lib.platforms.openbsd; }; + # overrides for chicken 5.4 + dbus = old: + (addToBuildInputsWithPkgConfig [ pkgs.dbus ] old) // { + # backticks in compiler options + # aren't supported anymore as of chicken 5.4, it seems. + preBuild = '' + substituteInPlace \ + dbus.egg dbus.setup \ + --replace '`pkg-config --cflags dbus-1`' "$(pkg-config --cflags dbus-1)" \ + --replace '`pkg-config --libs dbus-1`' "$(pkg-config --libs dbus-1)" + ''; + }; + math = old: { + # define-values is used but not imported + # some breaking change happened now it needs to be done + # explicitly? + preBuild = '' + substituteInPlace *.scm **/*.scm \ + --replace-quiet 'only chicken.base' 'only chicken.base define-values' + ''; + }; + socket = old: { + # chicken-do checks for changes to a file that doesn't exist + preBuild = '' + touch socket-config + ''; + }; + # mark broken "ephem-v1.1" = broken; F-operator = broken; From c768ee4aa3e3bc3438adb158a0a44effeda3f778 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:20:59 +0200 Subject: [PATCH 138/206] nixos/lomiri: ubuntu_font_family -> ubuntu-classic --- nixos/modules/services/desktop-managers/lomiri.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 8db2c4f5fca8..50080daaf7de 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -63,7 +63,7 @@ in { fonts.packages = with pkgs; [ # Applications tend to default to Ubuntu font - ubuntu_font_family + ubuntu-classic ]; # Copy-pasted basic stuff From 6613de20f24bace652af15727ab1b9a2c25e63a0 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:21:32 +0200 Subject: [PATCH 139/206] tests/lomiri-system-settings: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-system-settings.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-system-settings.nix b/nixos/tests/lomiri-system-settings.nix index 867fc14797e7..fac518484752 100644 --- a/nixos/tests/lomiri-system-settings.nix +++ b/nixos/tests/lomiri-system-settings.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; services.upower.enable = true; From 47e508ba36653578af343f3a465d46a5883183e1 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:21:56 +0200 Subject: [PATCH 140/206] tests/morph-browser: ubuntu_font_family -> ubuntu-classic --- nixos/tests/morph-browser.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/morph-browser.nix b/nixos/tests/morph-browser.nix index 859e6bb47646..65ad4d85cc12 100644 --- a/nixos/tests/morph-browser.nix +++ b/nixos/tests/morph-browser.nix @@ -23,7 +23,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: { fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From dc004592e8cd280f4cfd662466ca2ca82875486d Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:22:25 +0200 Subject: [PATCH 141/206] tests/lomiri-filemanager-app: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-filemanager-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-filemanager-app.nix b/nixos/tests/lomiri-filemanager-app.nix index de42c9d15089..efde3a01c114 100644 --- a/nixos/tests/lomiri-filemanager-app.nix +++ b/nixos/tests/lomiri-filemanager-app.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From 005ef5ab3962e56355710385e0e2a051dbd2da59 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:22:45 +0200 Subject: [PATCH 142/206] tests/lomiri-calculator-app: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-calculator-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-calculator-app.nix b/nixos/tests/lomiri-calculator-app.nix index 3231353097a7..14d8073611f2 100644 --- a/nixos/tests/lomiri-calculator-app.nix +++ b/nixos/tests/lomiri-calculator-app.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From 2d49594644df0819e33326c6fc02385853ffa023 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:23:00 +0200 Subject: [PATCH 143/206] tests/lomiri-clock-app: ubuntu_font_family -> ubuntu-classic --- nixos/tests/lomiri-clock-app.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/lomiri-clock-app.nix b/nixos/tests/lomiri-clock-app.nix index e68b89def534..9db5cee49cf7 100644 --- a/nixos/tests/lomiri-clock-app.nix +++ b/nixos/tests/lomiri-clock-app.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From 029b06454efb4360270fbcca90da42182dfdf68c Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Fri, 19 Jul 2024 19:23:19 +0200 Subject: [PATCH 144/206] tests/teleports: ubuntu_font_family -> ubuntu-classic --- nixos/tests/teleports.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/teleports.nix b/nixos/tests/teleports.nix index 31f4946a0843..a4293f954a45 100644 --- a/nixos/tests/teleports.nix +++ b/nixos/tests/teleports.nix @@ -24,7 +24,7 @@ fonts.packages = with pkgs; [ # Intended font & helps with OCR - ubuntu_font_family + ubuntu-classic ]; }; From 43ded946ff33b55ee824a795498b4e026a86a4e6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Jul 2024 19:29:30 +0200 Subject: [PATCH 145/206] python312Packages.pyserial-asyncio-fast: 0.13 -> 0.14 https://github.com/home-assistant-libs/pyserial-asyncio-fast/releases/tag/0.14 --- .../python-modules/pyserial-asyncio-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix index 18dc69489edf..17951563bed7 100644 --- a/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix +++ b/pkgs/development/python-modules/pyserial-asyncio-fast/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "pyserial-asyncio-fast"; - version = "0.13"; + version = "0.14"; pyproject = true; src = fetchFromGitHub { owner = "bdraco"; repo = "pyserial-asyncio-fast"; rev = version; - hash = "sha256-qAJ9jkhY2Gq/+/JBRObdSljTDPe3cKbjUfFon2ZgEps="; + hash = "sha256-ZnXuwHvYq/BrEW6YV6T0sQ03u2rpwNBnpF+dXAmvxKQ="; }; build-system = [ setuptools ]; From e7aea5de6ed1c0ae54340a152e6c75e7e72f0ecb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 17:42:07 +0000 Subject: [PATCH 146/206] wl-mirror: 0.16.4 -> 0.16.5 --- pkgs/tools/wayland/wl-mirror/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/wayland/wl-mirror/default.nix b/pkgs/tools/wayland/wl-mirror/default.nix index aed694c00239..e74f867a37ad 100644 --- a/pkgs/tools/wayland/wl-mirror/default.nix +++ b/pkgs/tools/wayland/wl-mirror/default.nix @@ -28,13 +28,13 @@ in stdenv.mkDerivation rec { pname = "wl-mirror"; - version = "0.16.4"; + version = "0.16.5"; src = fetchFromGitHub { owner = "Ferdi265"; repo = "wl-mirror"; rev = "v${version}"; - hash = "sha256-a/wBHfLQf2RTd6FsiScewm+KOPyCrS/IaJDsi6+zJfI="; + hash = "sha256-LafG2VEs7j4JwHayoT5euMp08RgSzk+HbfhCr6CX9OE="; }; strictDeps = true; From ebbc0409688869938bbcf630da1c1c13744d2a7b Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Fri, 5 Jul 2024 23:05:30 +0300 Subject: [PATCH 147/206] flaresolverr: init at 3.3.21 --- pkgs/by-name/fl/flaresolverr/package.nix | 82 ++++++++++++++++++++++++ 1 file changed, 82 insertions(+) create mode 100644 pkgs/by-name/fl/flaresolverr/package.nix diff --git a/pkgs/by-name/fl/flaresolverr/package.nix b/pkgs/by-name/fl/flaresolverr/package.nix new file mode 100644 index 000000000000..07e02231997c --- /dev/null +++ b/pkgs/by-name/fl/flaresolverr/package.nix @@ -0,0 +1,82 @@ +{ + lib, + stdenv, + fetchFromGitHub, + + makeWrapper, + + chromium, + python3, + undetected-chromedriver, + xorg, + + nixosTests, +}: + +let + python = python3.withPackages ( + ps: with ps; [ + bottle + func-timeout + prometheus-client + selenium + waitress + xvfbwrapper + + # For `undetected_chromedriver` + looseversion + requests + websockets + ] + ); +in +stdenv.mkDerivation (finalAttrs: { + pname = "flaresolverr"; + version = "3.3.21"; + + src = fetchFromGitHub { + owner = "FlareSolverr"; + repo = "FlareSolverr"; + rev = "v${finalAttrs.version}"; + hash = "sha256-M/snpYKZK3pgzlhYjRYEiAPlK9DUKYRiiu43KcrAy9g="; + }; + + nativeBuildInputs = [ makeWrapper ]; + + postPatch = '' + substituteInPlace src/undetected_chromedriver/patcher.py \ + --replace-fail \ + "from distutils.version import LooseVersion" \ + "from looseversion import LooseVersion" + + substituteInPlace src/utils.py \ + --replace-fail \ + 'CHROME_EXE_PATH = None' \ + 'CHROME_EXE_PATH = "${lib.getExe chromium}"' \ + --replace-fail \ + 'PATCHED_DRIVER_PATH = None' \ + 'PATCHED_DRIVER_PATH = "${lib.getExe undetected-chromedriver}"' + ''; + + installPhase = '' + mkdir -p $out/{bin,share/${finalAttrs.pname}-${finalAttrs.version}} + cp -r * $out/share/${finalAttrs.pname}-${finalAttrs.version}/. + + makeWrapper ${python}/bin/python $out/bin/flaresolverr \ + --add-flags "$out/share/${finalAttrs.pname}-${finalAttrs.version}/src/flaresolverr.py" \ + --prefix PATH : "${lib.makeBinPath [ xorg.xvfb ]}" + ''; + + passthru = { + tests.smoke-test = nixosTests.flaresolverr; + }; + + meta = with lib; { + description = "Proxy server to bypass Cloudflare protection"; + homepage = "https://github.com/FlareSolverr/FlareSolverr"; + license = licenses.mit; + mainProgram = "flaresolverr"; + maintainers = with maintainers; [ paveloom ]; + inherit (undetected-chromedriver.meta) platforms; + }; +}) From c9c14f86dbd8c91eeb7fdc679f1fa3c9b740aba1 Mon Sep 17 00:00:00 2001 From: Pavel Sobolev Date: Fri, 5 Jul 2024 23:06:17 +0300 Subject: [PATCH 148/206] nixos/flaresolverr: initial commit --- .../manual/release-notes/rl-2411.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/flaresolverr.nix | 58 +++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/flaresolverr.nix | 22 +++++++ 5 files changed, 84 insertions(+) create mode 100644 nixos/modules/services/misc/flaresolverr.nix create mode 100644 nixos/tests/flaresolverr.nix diff --git a/nixos/doc/manual/release-notes/rl-2411.section.md b/nixos/doc/manual/release-notes/rl-2411.section.md index 96cc4301851d..38168b312e41 100644 --- a/nixos/doc/manual/release-notes/rl-2411.section.md +++ b/nixos/doc/manual/release-notes/rl-2411.section.md @@ -18,6 +18,8 @@ ## New Services {#sec-release-24.11-new-services} +- [FlareSolverr](https://github.com/FlareSolverr/FlareSolverr), proxy server to bypass Cloudflare protection. Available as [services.flaresolverr](#opt-services.flaresolverr.enable) service. + - [Open-WebUI](https://github.com/open-webui/open-webui), a user-friendly WebUI for LLMs. Available as [services.open-webui](#opt-services.open-webui.enable) service. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index de15aa8c4be6..14ff9fd8b68f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -732,6 +732,7 @@ ./services/misc/etesync-dav.nix ./services/misc/evdevremapkeys.nix ./services/misc/felix.nix + ./services/misc/flaresolverr.nix ./services/misc/forgejo.nix ./services/misc/freeswitch.nix ./services/misc/fstrim.nix diff --git a/nixos/modules/services/misc/flaresolverr.nix b/nixos/modules/services/misc/flaresolverr.nix new file mode 100644 index 000000000000..7967580307f9 --- /dev/null +++ b/nixos/modules/services/misc/flaresolverr.nix @@ -0,0 +1,58 @@ +{ + config, + pkgs, + lib, + ... +}: + +let + cfg = config.services.flaresolverr; +in +{ + options = { + services.flaresolverr = { + enable = lib.mkEnableOption "FlareSolverr, a proxy server to bypass Cloudflare protection"; + + package = lib.mkPackageOption pkgs "flaresolverr" { }; + + openFirewall = lib.mkOption { + type = lib.types.bool; + default = false; + description = "Open the port in the firewall for FlareSolverr."; + }; + + port = lib.mkOption { + type = lib.types.port; + default = 8191; + description = "The port on which FlareSolverr will listen for incoming HTTP traffic."; + }; + }; + }; + + config = lib.mkIf cfg.enable { + systemd.services.flaresolverr = { + description = "FlareSolverr"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment = { + HOME = "/run/flaresolverr"; + PORT = toString cfg.port; + }; + + serviceConfig = { + SyslogIdentifier = "flaresolverr"; + Restart = "always"; + RestartSec = 5; + Type = "simple"; + DynamicUser = true; + RuntimeDirectory = "flaresolverr"; + WorkingDirectory = "/run/flaresolverr"; + ExecStart = lib.getExe cfg.package; + TimeoutStopSec = 30; + }; + }; + + networking.firewall = lib.mkIf cfg.openFirewall { allowedTCPPorts = [ cfg.port ]; }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 718aec882b4c..0852f2350e1d 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -332,6 +332,7 @@ in { firewall-nftables = handleTest ./firewall.nix { nftables = true; }; fish = handleTest ./fish.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; + flaresolverr = handleTest ./flaresolverr.nix {}; flood = handleTest ./flood.nix {}; floorp = handleTest ./firefox.nix { firefoxPackage = pkgs.floorp; }; fluentd = handleTest ./fluentd.nix {}; diff --git a/nixos/tests/flaresolverr.nix b/nixos/tests/flaresolverr.nix new file mode 100644 index 000000000000..0cec7adf6d6b --- /dev/null +++ b/nixos/tests/flaresolverr.nix @@ -0,0 +1,22 @@ +import ./make-test-python.nix ( + { lib, ... }: + { + name = "flaresolverr"; + meta.maintainers = with lib.maintainers; [ paveloom ]; + + nodes.machine = + { pkgs, ... }: + { + services.flaresolverr = { + enable = true; + port = 8888; + }; + }; + + testScript = '' + machine.wait_for_unit("flaresolverr.service") + machine.wait_for_open_port(8888) + machine.succeed("curl --fail http://localhost:8888/") + ''; + } +) From 9885de04cc1f193832abaaf5af3e3e53769471d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 08:47:42 +0000 Subject: [PATCH 149/206] minio: 2024-07-04T14-25-45Z -> 2024-07-16T23-46-41Z --- pkgs/servers/minio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/minio/default.nix b/pkgs/servers/minio/default.nix index a31c92d2d20a..c0103bafb445 100644 --- a/pkgs/servers/minio/default.nix +++ b/pkgs/servers/minio/default.nix @@ -21,16 +21,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2024-07-04T14-25-45Z"; + version = "2024-07-16T23-46-41Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - hash = "sha256-3JwfSiddVzyn8+vaj9bOHs3BHx8Okc/BC8C65ageYNM="; + hash = "sha256-L94lp3HTGALm6Ipd99R6cXOqeJZCLu4ORTCzlKX4o7A="; }; - vendorHash = "sha256-8sgi21P1dwVfSAH/26NNso7S6RzTOmkNh3cGNYmEhXY="; + vendorHash = "sha256-UUUqOZh6GGDBhuEdC3+KZeFtb1hm1WjfeN/DM+tcenI="; doCheck = false; From c07e46b23fce249c90646629e98864db51205673 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 19:32:47 +0000 Subject: [PATCH 150/206] cargo-make: 0.37.13 -> 0.37.14 --- pkgs/by-name/ca/cargo-make/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ca/cargo-make/package.nix b/pkgs/by-name/ca/cargo-make/package.nix index cfb10cd3e6a3..2d2c52f7e285 100644 --- a/pkgs/by-name/ca/cargo-make/package.nix +++ b/pkgs/by-name/ca/cargo-make/package.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.37.13"; + version = "0.37.14"; src = fetchFromGitHub { owner = "sagiegurari"; repo = "cargo-make"; rev = version; - hash = "sha256-5A0J3NtxXlhIhr0+GZoctCA5EwTnBt+9aL4I8HUiJqY="; + hash = "sha256-YyZF45Oi8sqTC/YM8F2dNBUI1rB0mPNeWMT7dYFWB5Q="; }; - cargoHash = "sha256-7UA9EOUF/A1FhWBErZdPrzL+rDukjbtC2KIK10cLDXI="; + cargoHash = "sha256-tidV2mZgrJCokeUVKYQKlYENm7v362sGsi2Eb0vLNJ8="; nativeBuildInputs = [ pkg-config ]; From a6ece406b43f85757abf2013b897ecb4b34c53b9 Mon Sep 17 00:00:00 2001 From: uncenter <47499684+uncenter@users.noreply.github.com> Date: Fri, 19 Jul 2024 15:43:39 -0400 Subject: [PATCH 151/206] vscode-extensions.nefrob.vscode-just-syntax: 0.3.0 -> 0.5.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index a1fb287bf140..2981d38bfc81 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -3551,8 +3551,8 @@ let mktplcRef = { name = "vscode-just-syntax"; publisher = "nefrob"; - version = "0.3.0"; - hash = "sha256-WBoqH9TNco9lyjOJfP54DynjmYZmPUY+YrZ1rQlC518="; + version = "0.5.1"; + hash = "sha256-DacDGK8gqlt8u0ZKcVxZ7jiUFFEX3ixv3P7RKWJVluA="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/nefrob.vscode-just-syntax/changelog"; From 08f63deadbf0d30de8fe4d8a804c58289365ad1b Mon Sep 17 00:00:00 2001 From: x123 Date: Thu, 11 Jul 2024 16:08:51 +0200 Subject: [PATCH 152/206] phraze: Add updateScript and version test --- pkgs/by-name/ph/phraze/package.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/by-name/ph/phraze/package.nix b/pkgs/by-name/ph/phraze/package.nix index 1ebd806bfc1d..bffa86e107ee 100644 --- a/pkgs/by-name/ph/phraze/package.nix +++ b/pkgs/by-name/ph/phraze/package.nix @@ -1,6 +1,9 @@ { lib, fetchFromGitHub, + testers, + nix-update-script, + phraze, rustPlatform, }: @@ -19,6 +22,13 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-kFk04YKDYiABWtild6aaP9H8gt/TuckOWRJE69dAXGU="; + passthru = { + updateScript = nix-update-script { }; + tests = { + version = testers.testVersion { package = phraze; }; + }; + }; + meta = { description = "Generate random passphrases"; homepage = "https://github.com/sts10/phraze"; From e5781fc314cdf1a48d1eea5c2773139364e287ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 20:50:55 +0000 Subject: [PATCH 153/206] files-cli: 2.13.85 -> 2.13.96 --- pkgs/by-name/fi/files-cli/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/fi/files-cli/package.nix b/pkgs/by-name/fi/files-cli/package.nix index 1058756179de..a438ebcb1514 100644 --- a/pkgs/by-name/fi/files-cli/package.nix +++ b/pkgs/by-name/fi/files-cli/package.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "files-cli"; - version = "2.13.85"; + version = "2.13.96"; src = fetchFromGitHub { repo = "files-cli"; owner = "files-com"; rev = "v${version}"; - hash = "sha256-rsEromVixVLtBLvhLWQ5ykjHq3/FScPSpuL9FqIOjZ8="; + hash = "sha256-TGaOTHtStmKHG/W/a/qWhZVt2IGcEdWD5mtZ2x4ozjI="; }; - vendorHash = "sha256-pobAFcmFsE340+Jboqnd88L3UHEquZ63eWwSXzgOWyc="; + vendorHash = "sha256-jeVEWicv2jYqhJt3aZAxx4fWmJXIVIryiS+ahqpdxsY="; ldflags = [ "-s" From ab164896468553c5f5eb55e63f66789a636b8ecd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 21:04:53 +0000 Subject: [PATCH 154/206] lbreakouthd: 1.1.8 -> 1.1.9 --- pkgs/by-name/lb/lbreakouthd/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/lb/lbreakouthd/package.nix b/pkgs/by-name/lb/lbreakouthd/package.nix index 2a5ddacbafdf..45911bacf770 100644 --- a/pkgs/by-name/lb/lbreakouthd/package.nix +++ b/pkgs/by-name/lb/lbreakouthd/package.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "lbreakouthd"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { url = "mirror://sourceforge/lgames/lbreakouthd-${finalAttrs.version}.tar.gz"; - hash = "sha256-3WZ77KVDNitdIcXPFf0CMXtjDvEXi91Jr7mpeV09Wt4="; + hash = "sha256-HIzZcH/yGBRX/9UyFuRyusAkzgzhREkMRNaP+6vQC+E="; }; buildInputs = [ From 425b56aa89d9f03c5406353bb26f28665ccbbd27 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 20 Jul 2024 00:18:30 +0300 Subject: [PATCH 155/206] kdePackages.kio: 6.4.0 -> 6.4.1 --- pkgs/kde/frameworks/kio/default.nix | 8 -------- pkgs/kde/generated/sources/frameworks.json | 6 +++--- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/pkgs/kde/frameworks/kio/default.nix b/pkgs/kde/frameworks/kio/default.nix index 8f3ba7022730..98d7a12f00b7 100644 --- a/pkgs/kde/frameworks/kio/default.nix +++ b/pkgs/kde/frameworks/kio/default.nix @@ -1,6 +1,5 @@ { mkKdeDerivation, - fetchpatch, qt5compat, qttools, acl, @@ -12,13 +11,6 @@ mkKdeDerivation { patches = [ # Remove hardcoded smbd search path ./0001-Remove-impure-smbd-search-path.patch - - # Backport fix for drag and drop - # FIXME: remove in next update - (fetchpatch { - url = "https://invent.kde.org/frameworks/kio/-/commit/e0ea91afdf0dccef7e3afbf23a159bf5a8d6b249.patch"; - hash = "sha256-YtklZr4DwV8wNABIAUm969w90hi4iEk5aW7a3n6yQeM="; - }) ]; extraBuildInputs = [qt5compat qttools acl attr]; diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index 09b895f6eac1..d1e3be448fd0 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -175,9 +175,9 @@ "hash": "sha256-/XvauI57zMszOHnrKN7fNYQsEQwFf/TH0/p3cI5UEpY=" }, "kio": { - "version": "6.4.0", - "url": "mirror://kde/stable/frameworks/6.4/kio-6.4.0.tar.xz", - "hash": "sha256-X6Ax87l+lu0ii3xCyWJenz5Ud+TKLVprov8dLY10B10=" + "version": "6.4.1", + "url": "mirror://kde/stable/frameworks/6.4/kio-6.4.1.tar.xz", + "hash": "sha256-i/H8bJk1EKFs2PcHebAjcB+XFHHTafVlqEBvSw07kFk=" }, "kirigami": { "version": "6.4.0", From 04ce8b383a9dbc928f46d8801e5382c10d5a4f18 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 20 Jul 2024 00:18:37 +0300 Subject: [PATCH 156/206] kdePackages.kwidgetsaddons: 6.4.0 -> 6.4.1 --- pkgs/kde/generated/sources/frameworks.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/kde/generated/sources/frameworks.json b/pkgs/kde/generated/sources/frameworks.json index d1e3be448fd0..c88e355d1a01 100644 --- a/pkgs/kde/generated/sources/frameworks.json +++ b/pkgs/kde/generated/sources/frameworks.json @@ -295,9 +295,9 @@ "hash": "sha256-sohaCI5fcHVFEcwd2wpDTBpteTnZx3/8NulUg0kfnkA=" }, "kwidgetsaddons": { - "version": "6.4.0", - "url": "mirror://kde/stable/frameworks/6.4/kwidgetsaddons-6.4.0.tar.xz", - "hash": "sha256-/afi6BOi3POjkWUplEmQecCyIsAfYneJeSh8YCo/Db8=" + "version": "6.4.1", + "url": "mirror://kde/stable/frameworks/6.4/kwidgetsaddons-6.4.1.tar.xz", + "hash": "sha256-010hmP8aRYHn1zOdW0IS5ezwXEheI0C+ILqEJg8o8js=" }, "kwindowsystem": { "version": "6.4.0", From 5f5da1624318db25e621a0d7b5f7c359abac1350 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 20 Jul 2024 00:20:42 +0300 Subject: [PATCH 157/206] home-assistant-custom-lovelace-modules.android-tv-card: 3.8.1 -> 3.8.2 Diff: https://github.com/Nerwyn/android-tv-card/compare/3.8.1...3.8.2 --- .../custom-lovelace-modules/android-tv-card/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix index 9398e57486f9..17d7339fdb0d 100644 --- a/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix +++ b/pkgs/servers/home-assistant/custom-lovelace-modules/android-tv-card/default.nix @@ -5,18 +5,18 @@ buildNpmPackage rec { pname = "android-tv-card"; - version = "3.8.1"; + version = "3.8.2"; src = fetchFromGitHub { owner = "Nerwyn"; repo = "android-tv-card"; rev = version; - hash = "sha256-ARFJJ119zJzjW0d59JFARMcjVAJ2IFDkShIN43d1adI="; + hash = "sha256-jGcicGeELUge1s92Gz6dHvQ2bzmk0sx1bmiQOiiP2Xo="; }; patches = [ ./dont-call-git.patch ]; - npmDepsHash = "sha256-t/kZTcXs3IpbrEfnmYQlJqhM8F3mO4prbQNnKtFqsDM="; + npmDepsHash = "sha256-kkwr4G+xyccr38ppXkiwfokOQL86mSDx+7DVKlzB9ww="; installPhase = '' runHook preInstall From 7bc65ab57916157e8549a74921a27222d0f8b233 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 22:28:19 +0000 Subject: [PATCH 158/206] nh: 3.5.18 -> 3.5.19 --- pkgs/by-name/nh/nh/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nh/nh/package.nix b/pkgs/by-name/nh/nh/package.nix index e11a8fc3f957..3150b129b7a2 100644 --- a/pkgs/by-name/nh/nh/package.nix +++ b/pkgs/by-name/nh/nh/package.nix @@ -10,7 +10,7 @@ , nix-output-monitor }: let - version = "3.5.18"; + version = "3.5.19"; runtimeDeps = [ nvd nix-output-monitor ]; in rustPlatform.buildRustPackage { @@ -21,7 +21,7 @@ rustPlatform.buildRustPackage { owner = "viperML"; repo = "nh"; rev = "refs/tags/v${version}"; - hash = "sha256-G5iteuo2gobI0Y5jHNEBc6UN9ixjwj6zopPKi7bJBE4="; + hash = "sha256-m6LmfrUMpt1ZUX3eqB7Gp+ZV6sAWPqkATwZNvA7Bj9U="; }; strictDeps = true; @@ -47,7 +47,7 @@ rustPlatform.buildRustPackage { --prefix PATH : ${lib.makeBinPath runtimeDeps} ''; - cargoHash = "sha256-jd8GOuI5E+l3u8klAKdwUdEP9N0Nao6MfTdHkSjym0M="; + cargoHash = "sha256-fyHyuZGjTsKynihlD3H3tSZeo8s9Trbe4NZ3Zv2MHmQ="; passthru.updateScript = nix-update-script { }; From 02df3302ed97ffba8b5e757e2fe9c065e9d12218 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 22:55:59 +0000 Subject: [PATCH 159/206] steampipe: 0.23.2 -> 0.23.3 --- pkgs/by-name/st/steampipe/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/st/steampipe/package.nix b/pkgs/by-name/st/steampipe/package.nix index e52182508c06..0e009f769208 100644 --- a/pkgs/by-name/st/steampipe/package.nix +++ b/pkgs/by-name/st/steampipe/package.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "steampipe"; - version = "0.23.2"; + version = "0.23.3"; src = fetchFromGitHub { owner = "turbot"; repo = "steampipe"; rev = "refs/tags/v${version}"; - hash = "sha256-hMEFIPhtvYkBG+HBtigOzFe8iAKmywWWl1da6sksX7k="; + hash = "sha256-V8wy9Q3FU4Ts7cer3tkv3gQbHebje3XRgm+IOg3Xs+c="; }; - vendorHash = "sha256-KY5mVs+YsyHHtV6DvfwwxcF8K9IQWxlxIJeSyFsKkpc="; + vendorHash = "sha256-OVWgDVF2d+OYYCSn+UlSMTfIS+5nFeI2qY41DyX7y/A="; proxyVendor = true; postPatch = '' From 8683c4a2c14b65945e3259f4a98bf7b6511ded70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Jul 2024 23:13:22 +0000 Subject: [PATCH 160/206] numix-icon-theme-circle: 24.04.22 -> 24.07.19 --- pkgs/data/icons/numix-icon-theme-circle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/numix-icon-theme-circle/default.nix b/pkgs/data/icons/numix-icon-theme-circle/default.nix index 215d2f4c3138..6e26a6cdeee3 100644 --- a/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "24.04.22"; + version = "24.07.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-FRE3zb/81IEHFFvX+rIDFPVe5vw/hToLqVLkXssMgoA="; + sha256 = "sha256-tCqsFcKGUV4sLkoyc3beHmnJxVwRxEGo+G5PJfBuHbI="; }; nativeBuildInputs = [ gtk3 ]; From f32dd9ae988dd4c4cb1f2acdac84ae1273f1771b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Jul 2024 03:52:01 +0000 Subject: [PATCH 161/206] python312Packages.gpytorch: 1.11 -> 1.12 --- pkgs/development/python-modules/gpytorch/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/gpytorch/default.nix b/pkgs/development/python-modules/gpytorch/default.nix index 27bc11f0ee0e..cb449dc56d61 100644 --- a/pkgs/development/python-modules/gpytorch/default.nix +++ b/pkgs/development/python-modules/gpytorch/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "gpytorch"; - version = "1.11"; + version = "1.12"; format = "pyproject"; src = fetchFromGitHub { owner = "cornellius-gp"; repo = pname; - rev = "v${version}"; - hash = "sha256-cpkfjx5G/4duL1Rr4nkHTHi03TDcYbcx3bKP2Ny7Ijo="; + rev = "refs/tags/v${version}"; + hash = "sha256-8W0QSiXl+C86m5yaI9KfGN92uA2VGjGwQt6DI/1NaQE="; }; patches = [ From d780bd9c7079d7301cde744ceefe32953f33235c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 00:11:45 +0000 Subject: [PATCH 162/206] android-studio: 2024.1.1.11 -> 2024.1.1.12 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d7b64de97cf2..c96fcbc709e1 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -9,8 +9,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2024.1.1.11"; # "Android Studio Koala | 2024.1.1" - sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU="; + version = "2024.1.1.12"; # "Android Studio Koala | 2024.1.1 Patch 1" + sha256Hash = "sha256-Qvi/Mc4NEk3dERlfZiowBk2Pmqsgbl5mg56HamvG7aI="; }; betaVersion = { version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2" From 82019fb33d612ce7f1634186b16b00ccab828011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 00:11:59 +0000 Subject: [PATCH 163/206] androidStudioPackages.canary: 2024.1.2.8 -> 2024.1.3.1 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d7b64de97cf2..3574cadc355b 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -17,8 +17,8 @@ let sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8="; }; latestVersion = { - version = "2024.1.2.8"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 8" - sha256Hash = "sha256-2wqZV0UqZHprfUFvhWh0IdA9TQcwlZtWECZVwZ47ICc="; + version = "2024.1.3.1"; # "Android Studio Ladybug | 2024.1.3 Canary 1" + sha256Hash = "sha256-BSrcPdkK4dU5/bV29NGKcCR10XYMJrPvC91fcJs5Vq8="; }; in { # Attributes are named by their corresponding release channels From 9f8234f17e88f545449f03e8a1bc4c1c25ac707e Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 20 Jul 2024 03:05:18 +0200 Subject: [PATCH 164/206] ntpd-rs: 1.2.0 -> 1.2.2 --- pkgs/by-name/nt/ntpd-rs/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 780eb2c0877d..055ec97b491b 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "ntpd-rs"; - version = "1.2.0"; + version = "1.2.2"; src = fetchFromGitHub { owner = "pendulum-project"; repo = "ntpd-rs"; rev = "v${version}"; - hash = "sha256-yIX9RD1xqkFoxDt82wnKfQR3z/vLA0I5/cptaIgSNjw="; + hash = "sha256-td+op7nVmznIcj3JYafEy7HgbBPLuRv25Hu2N5A5qOQ="; }; - cargoHash = "sha256-NRFmb9rZVbd0qYKIkslT4TcbC/aD4QhAjm2GA4BvReY="; + cargoHash = "sha256-guim3IC2uIA7NKMXDCil/UK8Yj+rt2KUSwtJTcBcZoU="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk_11_0.frameworks.Security ]; nativeBuildInputs = [ From 8a6b6167bbf6178f9ff150025a4f06a48b02f039 Mon Sep 17 00:00:00 2001 From: Audrey Dutcher Date: Fri, 19 Jul 2024 09:39:11 -0700 Subject: [PATCH 165/206] go: support FreeBSD --- pkgs/development/compilers/go/1.21.nix | 2 +- pkgs/development/compilers/go/1.22.nix | 2 +- pkgs/development/compilers/go/1.23.nix | 2 +- pkgs/development/compilers/go/bootstrap121.nix | 5 +++++ pkgs/development/compilers/go/print-hashes.sh | 2 +- 5 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/go/1.21.nix b/pkgs/development/compilers/go/1.21.nix index 68fe8a015c87..1e83bf9a2ce0 100644 --- a/pkgs/development/compilers/go/1.21.nix +++ b/pkgs/development/compilers/go/1.21.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux; + platforms = platforms.darwin ++ platforms.linux ++ platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.22.nix b/pkgs/development/compilers/go/1.22.nix index dc027c785e56..fcbd87f25cb6 100644 --- a/pkgs/development/compilers/go/1.22.nix +++ b/pkgs/development/compilers/go/1.22.nix @@ -186,7 +186,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/1.23.nix b/pkgs/development/compilers/go/1.23.nix index 80c351f7ebd8..fb83a95dd4ca 100644 --- a/pkgs/development/compilers/go/1.23.nix +++ b/pkgs/development/compilers/go/1.23.nix @@ -184,7 +184,7 @@ stdenv.mkDerivation (finalAttrs: { homepage = "https://go.dev/"; license = licenses.bsd3; maintainers = teams.golang.members; - platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi; + platforms = platforms.darwin ++ platforms.linux ++ platforms.wasi ++ platforms.freebsd; mainProgram = "go"; }; }) diff --git a/pkgs/development/compilers/go/bootstrap121.nix b/pkgs/development/compilers/go/bootstrap121.nix index f243ca30abf3..d9b4fa9a14f8 100644 --- a/pkgs/development/compilers/go/bootstrap121.nix +++ b/pkgs/development/compilers/go/bootstrap121.nix @@ -5,6 +5,11 @@ callPackage ./binary.nix { # Use `print-hashes.sh ${version}` to generate the list below darwin-amd64 = "b314de9f704ab122c077d2ec8e67e3670affe8865479d1f01991e7ac55d65e70"; darwin-arm64 = "3aca44de55c5e098de2f406e98aba328898b05d509a2e2a356416faacf2c4566"; + freebsd-386 = "312a0065714a50862af714e7a5b3fbbd70fe68f905ffb9bcc56d42eadf6bffab"; + freebsd-amd64 = "b8eaa36654625df799654f77f4af0ea7bd9e5e760ebe86e68fe7c484748ae995"; + freebsd-arm64 = "bca5be1a9934fc522cb1a2e4849bb9f12ee6b480b48949e36a4dfb8e755a4b25"; + freebsd-armv6l = "f4c9c91fa9c37d6d6b7644f3f6b67167b2a44bd48c0cba1d2a5ff5fd50ceb364"; + freebsd-riscv64 = "45b99a9884dcd0dd4c8e4c0f99a4dc2901b8e9628dd8091ae5c0620afd536f0a"; linux-386 = "0e6f378d9b072fab0a3d9ff4d5e990d98487d47252dba8160015a61e6bd0bcba"; linux-amd64 = "d0398903a16ba2232b389fb31032ddf57cac34efda306a0eebac34f0965a0742"; linux-arm64 = "f3d4548edf9b22f26bbd49720350bbfe59d75b7090a1a2bff1afad8214febaf3"; diff --git a/pkgs/development/compilers/go/print-hashes.sh b/pkgs/development/compilers/go/print-hashes.sh index ed3e62b941b8..bd35b0b69f66 100755 --- a/pkgs/development/compilers/go/print-hashes.sh +++ b/pkgs/development/compilers/go/print-hashes.sh @@ -13,4 +13,4 @@ fi curl -s "${BASEURL}?mode=json&include=all" | jq '.[] | select(.version == "go'"${VERSION}"'")' | - jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' + jq -r '.files[] | select(.kind == "archive" and (.os == "linux" or .os == "darwin" or .os == "freebsd")) | (.os + "-" + .arch + " = \"" + .sha256 + "\";")' From 9946cc142a05a865ccee79de967f38145a816249 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:26:42 +0000 Subject: [PATCH 166/206] kustomize: 5.4.2 -> 5.4.3 --- pkgs/development/tools/kustomize/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index 8d364f2d58c5..e7e9a8d0b013 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "kustomize"; - version = "5.4.2"; + version = "5.4.3"; ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in [ @@ -15,13 +15,13 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - hash = "sha256-cNmDhKRi4pk26vADFMXN6SocdPF1EIYf4wT4fQYgPVc="; + hash = "sha256-DrdExiGDWBrlbNIY6R9SXD4cuVyLBOE3ePw1J3hymHA="; }; # avoid finding test and development commands modRoot = "kustomize"; proxyVendor = true; - vendorHash = "sha256-Nbc3zdVD8KIL80TqdcVNFMowfFsKKIPsEpkwq5fvWAI="; + vendorHash = "sha256-cyTZCa1kmNhomkNNnt2Waww4czOZ5YzDBUDx5gqLHtQ="; nativeBuildInputs = [ installShellFiles ]; From 296370e75f0099b9782f576b84b744ee76135d70 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:37:48 +0000 Subject: [PATCH 167/206] cargo-modules: 0.16.3 -> 0.16.6 --- pkgs/development/tools/rust/cargo-modules/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-modules/default.nix b/pkgs/development/tools/rust/cargo-modules/default.nix index 2745b9c586b9..8c539eeb9651 100644 --- a/pkgs/development/tools/rust/cargo-modules/default.nix +++ b/pkgs/development/tools/rust/cargo-modules/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-modules"; - version = "0.16.3"; + version = "0.16.6"; src = fetchFromGitHub { owner = "regexident"; repo = pname; rev = "v${version}"; - hash = "sha256-6JFQuFISIKmR+dm2YYb4iwBjR61WrcLpfwcC67a96t4="; + hash = "sha256-noUlwAoJMDim1TI3aiacLtOXsHd2IEZbrjYQoeoo7yM="; }; - cargoHash = "sha256-TiSiOMBkmH4Y5VORXZ59fl9+EwOjfWV2n/r3LTmSFxQ="; + cargoHash = "sha256-EbhLIVe9FizxNmyoEo3b/IZQ6jbL6vQUunFzfM2QRL8="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From 44a500aa336a1eb4c86ac517fea69bf3077de5aa Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Fri, 19 Jul 2024 10:20:45 -0700 Subject: [PATCH 168/206] safeeyes: add missing setuptools dependency Fixes: Traceback (most recent call last): File "/nix/store/km8nzjccd4r0g704is31q18qzl101g89-safeeyes-2.1.9/bin/.safeeyes-wrapped", line 6, in from safeeyes.__main__ import main File "/nix/store/km8nzjccd4r0g704is31q18qzl101g89-safeeyes-2.1.9/lib/python3.12/site-packages/safeeyes/__main__.py", line 32, in from safeeyes import utility File "/nix/store/km8nzjccd4r0g704is31q18qzl101g89-safeeyes-2.1.9/lib/python3.12/site-packages/safeeyes/utility.py", line 35, in from distutils.version import LooseVersion ModuleNotFoundError: No module named 'distutils' --- pkgs/applications/misc/safeeyes/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/safeeyes/default.nix b/pkgs/applications/misc/safeeyes/default.nix index 19ba41852176..661396aa3e76 100644 --- a/pkgs/applications/misc/safeeyes/default.nix +++ b/pkgs/applications/misc/safeeyes/default.nix @@ -47,6 +47,7 @@ buildPythonApplication rec { pygobject3 dbus-python croniter + setuptools ]; # Prevent double wrapping, let the Python wrapper use the args in preFixup. From ab11ce32aec390ad814b15470ae82d763c114729 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 19 Jul 2024 19:57:19 +0200 Subject: [PATCH 169/206] python312Packages.holidays: 0.52 -> 0.53 https://github.com/vacanza/python-holidays/releases/tag/v0.53 --- pkgs/development/python-modules/holidays/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/holidays/default.nix b/pkgs/development/python-modules/holidays/default.nix index 22948219d3db..2a0dfec49bba 100644 --- a/pkgs/development/python-modules/holidays/default.nix +++ b/pkgs/development/python-modules/holidays/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "holidays"; - version = "0.52"; + version = "0.53"; pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "vacanza"; repo = "python-holidays"; rev = "refs/tags/v${version}"; - hash = "sha256-sLtszBu/eyhfIW8xdkHb3FWx2pW/E8cxPeNa4o7DnIs="; + hash = "sha256-qL6ZjnVecAs8vHbbb2IRQPSDpFFPmFuu16UEBsY8vKw="; }; build-system = [ From 451fb7a2bdb61e37df33e4e8e4876eb89097e7cc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Jul 2024 23:35:09 +0200 Subject: [PATCH 170/206] python312Packages.pytedee-async: 0.2.17 -> 0.2.20 Diff: https://github.com/zweckj/pytedee_async/compare/refs/tags/v0.2.17...v0.2.20 Changelog: https://github.com/zweckj/pytedee_async/releases/tag/v0.2.20 --- pkgs/development/python-modules/pytedee-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytedee-async/default.nix b/pkgs/development/python-modules/pytedee-async/default.nix index 181da2761bab..ccf6fd94f7db 100644 --- a/pkgs/development/python-modules/pytedee-async/default.nix +++ b/pkgs/development/python-modules/pytedee-async/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pytedee-async"; - version = "0.2.17"; + version = "0.2.20"; pyproject = true; disabled = pythonOlder "3.9"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "zweckj"; repo = "pytedee_async"; rev = "refs/tags/v${version}"; - hash = "sha256-5mCHCzoDJ6+ao2guhAtVjvPaAS6Hutn+NwaQIjWDlgo="; + hash = "sha256-mBE5h6oGEJ2Wzb/PCD4vwFs52tWy+YmQVA06BPVW1Kg="; }; build-system = [ setuptools ]; From 31f445c003a177df40271b9b29c57f34cc8283ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Jul 2024 20:15:08 +0200 Subject: [PATCH 171/206] python312Packages.python-kasa: 0.7.0.3 -> 0.7.0.5 Diff: https://github.com/python-kasa/python-kasa/compare/refs/tags/0.7.0.3...0.7.0.5 Changelog: https://github.com/python-kasa/python-kasa/blob/0.7.0.5/CHANGELOG.md Co-Authored-By: Martin Weinelt --- .../python-modules/python-kasa/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index 087b5ffc66c5..11faea189227 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -9,27 +9,29 @@ kasa-crypt, orjson, poetry-core, + ptpython, pydantic, pytest-asyncio, pytest-freezer, pytest-mock, pytestCheckHook, pythonOlder, + rich, voluptuous, }: buildPythonPackage rec { pname = "python-kasa"; - version = "0.7.0.4"; + version = "0.7.0.5"; pyproject = true; - disabled = pythonOlder "3.8"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-MZgbHohp+QaTg7gdsIu3Q/4sLVqvtzDjmQScYSZO3Yw="; + hash = "sha256-ITXezc6m7ocOqSHTVP583lZZmYaZQn9nQSErEB9fV/M="; }; build-system = [ poetry-core ]; @@ -51,6 +53,10 @@ buildPythonPackage rec { ]; passthru.optional-dependencies = { + shell = [ + ptpython + rich + ]; speedups = [ kasa-crypt orjson @@ -68,10 +74,10 @@ buildPythonPackage rec { meta = with lib; { description = "Python API for TP-Link Kasa Smarthome products"; - mainProgram = "kasa"; homepage = "https://python-kasa.readthedocs.io/"; changelog = "https://github.com/python-kasa/python-kasa/blob/${version}/CHANGELOG.md"; license = licenses.gpl3Plus; maintainers = with maintainers; [ fab ]; + mainProgram = "kasa"; }; } From 183c48e99e7bbab447b555f7caf9d5e778660433 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 19 Jul 2024 08:29:17 -0700 Subject: [PATCH 172/206] python312Packages.upb-lib: 0.5.7 -> 0.5.8 Diff: https://github.com/gwww/upb-lib/compare/refs/tags/0.5.7...0.5.8 Changelog: https://github.com/gwww/upb-lib/releases/tag/0.5.8 --- pkgs/development/python-modules/upb-lib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/upb-lib/default.nix b/pkgs/development/python-modules/upb-lib/default.nix index 0798fd181281..b19508b01754 100644 --- a/pkgs/development/python-modules/upb-lib/default.nix +++ b/pkgs/development/python-modules/upb-lib/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "upb-lib"; - version = "0.5.7"; + version = "0.5.8"; pyproject = true; disabled = pythonOlder "3.11"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "gwww"; repo = "upb-lib"; rev = "refs/tags/${version}"; - hash = "sha256-y06/XqdmGXTd2Qhr2iXnmIKCSpAetXwI1UXv555ewoc="; + hash = "sha256-YCJl3cIaNmRQ5+GbIDcAvDhI0R4r2AWG2Ba1zmnfbMA="; }; build-system = [ poetry-core ]; From 4308f96052ed478d1fc800575c9d0600e9a32266 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:39:31 +0000 Subject: [PATCH 173/206] obs-studio-plugins.obs-move-transition: 3.0.1 -> 3.0.2 --- .../video/obs-studio/plugins/obs-move-transition.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix index e464079da93c..c4e2dc43d246 100644 --- a/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix +++ b/pkgs/applications/video/obs-studio/plugins/obs-move-transition.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "obs-move-transition"; - version = "3.0.1"; + version = "3.0.2"; src = fetchFromGitHub { owner = "exeldro"; repo = "obs-move-transition"; rev = version; - sha256 = "sha256-LZL9f/pX74rKW+wnNHGKwGuuISOTcFVr6W9h/JEK0U4="; + sha256 = "sha256-Vwm0Eyb8MevZtS3PTqnFQAbCj7JuTw9Ju0lS9CZ6rf8="; }; nativeBuildInputs = [ cmake ]; From ff6f53e8018ca5efc65040bdf148ad3666ddc6f2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Jul 2024 03:48:00 +0200 Subject: [PATCH 174/206] home-assistant: 2024.7.2 -> 2024.7.3 https://github.com/home-assistant/core/releases/tag/2024.7.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 13 ++++++++++--- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index f072c83555e5..d623c3ddcbee 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2024.7.2"; + version = "2024.7.3"; components = { "3_day_blinds" = ps: with ps; [ ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 1f3cba59882b..3d64bf38457d 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -476,7 +476,7 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run update-component-packages.py after updating - hassVersion = "2024.7.2"; + hassVersion = "2024.7.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -494,13 +494,13 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = "refs/tags/${version}"; - hash = "sha256-FML1JZFj2xebcQvXJmBu02Eczz3ejg4r7PfnpBiDc50="; + hash = "sha256-6f4z1mpoLOntImC161+0CyyuT3NrPdfuCa6/+wqzHgs="; }; # Secondary source is pypi sdist for translations sdist = fetchPypi { inherit pname version; - hash = "sha256-okukdAbBXJCaDpnOCDY91dsLQdm5pMJ1SKXV9A68eoQ="; + hash = "sha256-YtrOUSQFTgDFL+iPm3itkKsMXs9IKyB2rCnpe7Bn2Gk="; }; build-system = with python.pkgs; [ @@ -649,6 +649,13 @@ in python.pkgs.buildPythonApplication rec { "--deselect=tests/helpers/test_translation.py::test_caching" # assert "Detected that integration 'hue' attempted to create an asyncio task from a thread at homeassistant/components/hue/light.py, line 23 "--deselect=tests/util/test_async.py::test_create_eager_task_from_thread_in_integration" + # Services were renamed to Actions in language strings, but the tests are lagging behind + "--deselect=tests/test_core.py::test_serviceregistry_service_that_not_exists" + "--deselect=tests/test_core.py::test_services_call_return_response_requires_blocking" + "--deselect=tests/test_core.py::test_serviceregistry_return_response_arguments" + "--deselect=tests/helpers/test_script.py::test_parallel_error" + "--deselect=tests/helpers/test_script.py::test_propagate_error_service_not_found" + "--deselect=tests/helpers/test_script.py::test_continue_on_error_automation_issue" # tests are located in tests/ "tests" ]; From d56ca2cc3c43f4380c450295f74bdf5766aa4386 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Jul 2024 03:58:09 +0200 Subject: [PATCH 175/206] python312Packages.homeassistant-stubs: 2024.7.2 -> 2024.7.3 https://github.com/KapJI/homeassistant-stubs/releases/tag/2024.7.3 --- pkgs/servers/home-assistant/stubs.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/stubs.nix b/pkgs/servers/home-assistant/stubs.nix index 58a30d1c87b6..b5c963f2c434 100644 --- a/pkgs/servers/home-assistant/stubs.nix +++ b/pkgs/servers/home-assistant/stubs.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "homeassistant-stubs"; - version = "2024.7.2"; + version = "2024.7.3"; pyproject = true; disabled = python.version != home-assistant.python.version; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "KapJI"; repo = "homeassistant-stubs"; rev = "refs/tags/${version}"; - hash = "sha256-MMFt8TGWB+7wUKYWL4IJyhI3YOumll8Jq5GWZpaZZ8I="; + hash = "sha256-4n1dnQX7Mo2vFCrSUUAvdO3ZErBKK6oUCITazI9PlIQ="; }; build-system = [ From f2a6b12af7bb1160c214b83aa3ecd9a73dd2cba3 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Sat, 20 Jul 2024 03:06:54 +0200 Subject: [PATCH 176/206] ntpd-rs: disable testsuite, too flaky --- pkgs/by-name/nt/ntpd-rs/package.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/by-name/nt/ntpd-rs/package.nix b/pkgs/by-name/nt/ntpd-rs/package.nix index 055ec97b491b..3e7c35227c33 100644 --- a/pkgs/by-name/nt/ntpd-rs/package.nix +++ b/pkgs/by-name/nt/ntpd-rs/package.nix @@ -40,6 +40,9 @@ rustPlatform.buildRustPackage rec { source utils/generate-man.sh ''; + # lots of flaky tests + doCheck = false; + checkFlags = [ # doesn't find the testca "--skip=daemon::keyexchange::tests" From 5317c2ed17889e6eb875504d8785181438cce5cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 02:40:18 +0000 Subject: [PATCH 177/206] python312Packages.yfinance: 0.2.40 -> 0.2.41 --- pkgs/development/python-modules/yfinance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yfinance/default.nix b/pkgs/development/python-modules/yfinance/default.nix index eb454cd9a4dc..2be3d381feb6 100644 --- a/pkgs/development/python-modules/yfinance/default.nix +++ b/pkgs/development/python-modules/yfinance/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { pname = "yfinance"; - version = "0.2.40"; + version = "0.2.41"; pyproject = true; disabled = pythonOlder "3.7"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "ranaroussi"; repo = "yfinance"; rev = "refs/tags/${version}"; - hash = "sha256-y3vcgPhksW8g0WpqVgJej7s+aIj9zaAjBjSm8d7yrjs="; + hash = "sha256-9Vp/z0u/Mfil1xWHvHPRFa62sLvEJMjHLBYweLfz42o="; }; build-system = [ setuptools ]; From 742a358a9375d7a1ae99bdac2ca85347854d8cbd Mon Sep 17 00:00:00 2001 From: Lin Jian Date: Sat, 20 Jul 2024 12:26:09 +0800 Subject: [PATCH 178/206] emacsPackages.ott-mode: trivialBuild -> melpaBuild Also fix homepage and license. --- .../manual-packages/ott-mode/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix index 6eeead468ff2..ac208e29dbf4 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix +++ b/pkgs/applications/editors/emacs/elisp-packages/manual-packages/ott-mode/default.nix @@ -1,19 +1,22 @@ -{ trivialBuild -, ott -, haskellPackages -}: +{ melpaBuild, ott }: -trivialBuild { +melpaBuild { pname = "ott-mode"; inherit (ott) src version; - postUnpack = '' - mv $sourceRoot/emacs/ott-mode.el $sourceRoot + files = ''("emacs/*.el")''; + + postPatch = '' + pushd emacs + echo ";;; ott-mode.el ---" > tmp.el + cat ott-mode.el >> tmp.el + mv tmp.el ott-mode.el + popd ''; meta = { description = "Emacs ott mode (from ott sources)"; - inherit (haskellPackages.Agda.meta) homepage license; + inherit (ott.meta) homepage license; }; } From e56a0db7b3470168bc725808e472688ff145e101 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 04:38:30 +0000 Subject: [PATCH 179/206] python312Packages.distributed: 2024.7.0 -> 2024.7.1 --- pkgs/development/python-modules/distributed/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/distributed/default.nix b/pkgs/development/python-modules/distributed/default.nix index 8455b4506268..92998e42eb4e 100644 --- a/pkgs/development/python-modules/distributed/default.nix +++ b/pkgs/development/python-modules/distributed/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { pname = "distributed"; - version = "2024.7.0"; + version = "2024.7.1"; pyproject = true; disabled = pythonOlder "3.9"; @@ -34,7 +34,7 @@ buildPythonPackage rec { owner = "dask"; repo = "distributed"; rev = "refs/tags/${version}"; - hash = "sha256-Nf/TOLqBaYhezXcBJPMvBwkP+cH5BnN5rxGqLMAb/8U="; + hash = "sha256-1VLYOUPo2esFltcoI6B/HMGyuyRq4vvkE55C8acdbG8="; }; postPatch = '' From 2b2d6041aeb93bbd8692a8b59e0091b22aff2166 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 05:20:40 +0000 Subject: [PATCH 180/206] python312Packages.rotary-embedding-torch: 0.6.2 -> 0.6.4 --- .../python-modules/rotary-embedding-torch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rotary-embedding-torch/default.nix b/pkgs/development/python-modules/rotary-embedding-torch/default.nix index 3724cb4adedd..6608071f1dd8 100644 --- a/pkgs/development/python-modules/rotary-embedding-torch/default.nix +++ b/pkgs/development/python-modules/rotary-embedding-torch/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "rotary-embedding-torch"; - version = "0.6.2"; + version = "0.6.4"; pyproject = true; src = fetchFromGitHub { owner = "lucidrains"; repo = "rotary-embedding-torch"; rev = "refs/tags/${version}"; - hash = "sha256-AR/zQFH0uvPrCp61XLiRBiAO3ZnD4jVaDXN00hXDlnI="; + hash = "sha256-dP7QFUNIGFFQcR98po+LYg3MU7P+GUunO7zz/y8vZmY="; }; nativeBuildInputs = [ From 7bd3602bd17da03d9f675c26bfb39ce6edd57219 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 20 Jul 2024 00:32:39 -0400 Subject: [PATCH 181/206] open-scq30: add CoreBluetooth framework on Darwin --- pkgs/by-name/op/open-scq30/package.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/by-name/op/open-scq30/package.nix b/pkgs/by-name/op/open-scq30/package.nix index 3e2e41a15e98..33d4e47c76fb 100644 --- a/pkgs/by-name/op/open-scq30/package.nix +++ b/pkgs/by-name/op/open-scq30/package.nix @@ -44,6 +44,7 @@ rustPlatform.buildRustPackage rec { pango ] ++ lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit + darwin.apple_sdk.frameworks.CoreBluetooth darwin.apple_sdk.frameworks.CoreGraphics darwin.apple_sdk.frameworks.Foundation ]; From ab42ca141a289b8afc0e42dafb5e6172fb398cd6 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Sat, 20 Jul 2024 09:08:30 +0200 Subject: [PATCH 182/206] doc: Remove indefinite article and ending period from example meta.description so that meta.description examples shown in the documentation align with recommendations given in the "Meta attributes" section in pkgs/README.md. The changes were made with the following commands: nix run nixpkgs#silver-searcher -- -l0 'description\s*=\s*"([Aa]n?|[Tt]he)\s' doc \ | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee '/description/s/"([Aa]n?|[Tt]he)\s(.)/"\U\2/' nix run nixpkgs#silver-searcher -- -l0 'description\s*=\s*".*\."' doc \ | xargs -0 nix run nixpkgs#gnused -- -i '' -Ee '/description/s/\."/"/' --- doc/languages-frameworks/coq.section.md | 2 +- doc/languages-frameworks/javascript.section.md | 2 +- doc/languages-frameworks/ocaml.section.md | 2 +- doc/languages-frameworks/perl.section.md | 2 +- doc/languages-frameworks/python.section.md | 4 ++-- doc/languages-frameworks/rust.section.md | 4 ++-- doc/languages-frameworks/texlive.section.md | 2 +- doc/stdenv/meta.chapter.md | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/doc/languages-frameworks/coq.section.md b/doc/languages-frameworks/coq.section.md index fdc824781cd1..557896074bf0 100644 --- a/doc/languages-frameworks/coq.section.md +++ b/doc/languages-frameworks/coq.section.md @@ -84,7 +84,7 @@ mkCoqDerivation { [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; meta = { - description = "A Coq/SSReflect Library for Monoidal Rings and Multinomials"; + description = "Coq/SSReflect Library for Monoidal Rings and Multinomials"; license = lib.licenses.cecill-c; }; } diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index 80d61816acb4..7975d7c9e43f 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -206,7 +206,7 @@ buildNpmPackage rec { NODE_OPTIONS = "--openssl-legacy-provider"; meta = { - description = "A modern web UI for various torrent clients with a Node.js backend and React frontend"; + description = "Modern web UI for various torrent clients with a Node.js backend and React frontend"; homepage = "https://flood.js.org"; license = lib.licenses.gpl3Only; maintainers = with lib.maintainers; [ winter ]; diff --git a/doc/languages-frameworks/ocaml.section.md b/doc/languages-frameworks/ocaml.section.md index 46fddcb3b9de..acefddc7c2f2 100644 --- a/doc/languages-frameworks/ocaml.section.md +++ b/doc/languages-frameworks/ocaml.section.md @@ -113,7 +113,7 @@ buildDunePackage rec { meta = { homepage = "https://github.com/flowtype/ocaml-wtf8"; - description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates."; + description = "WTF-8 is a superset of UTF-8 that allows unpaired surrogates"; license = lib.licenses.mit; maintainers = [ lib.maintainers.eqyiel ]; }; diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md index 4ef6d173a178..a3d76a44f656 100644 --- a/doc/languages-frameworks/perl.section.md +++ b/doc/languages-frameworks/perl.section.md @@ -158,7 +158,7 @@ $ nix-generate-from-cpan XML::Simple }; propagatedBuildInputs = [ XMLNamespaceSupport XMLSAX XMLSAXExpat ]; meta = { - description = "An API for simple XML files"; + description = "API for simple XML files"; license = with lib.licenses; [ artistic1 gpl1Plus ]; }; }; diff --git a/doc/languages-frameworks/python.section.md b/doc/languages-frameworks/python.section.md index 07b7fad74a6e..519fd6fbf960 100644 --- a/doc/languages-frameworks/python.section.md +++ b/doc/languages-frameworks/python.section.md @@ -993,7 +993,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/blaze/datashape/releases/tag/${version}"; homepage = "https://github.com/ContinuumIO/datashape"; - description = "A data description language"; + description = "Data description language"; license = lib.licenses.bsd2; }; } @@ -1118,7 +1118,7 @@ buildPythonPackage rec { meta = { changelog = "https://github.com/pyFFTW/pyFFTW/releases/tag/v${version}"; - description = "A pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; + description = "Pythonic wrapper around FFTW, the FFT library, presenting a unified interface for all the supported transforms"; homepage = "http://hgomersall.github.com/pyFFTW"; license = with lib.licenses; [ bsd2 bsd3 ]; }; diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index e12bbe02bfb5..48c32f324df4 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -38,7 +38,7 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-jtBw4ahSl88L0iuCXxQgZVm1EcboWRJMNtjxLVTtzts="; meta = { - description = "A fast line-oriented regex search tool, similar to ag and ack"; + description = "Fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; license = lib.licenses.unlicense; maintainers = []; @@ -1000,7 +1000,7 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = { - description = "A fast line-oriented regex search tool, similar to ag and ack"; + description = "Fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; license = with lib.licenses; [ mit unlicense ]; maintainers = with lib.maintainers; []; diff --git a/doc/languages-frameworks/texlive.section.md b/doc/languages-frameworks/texlive.section.md index 05ef288141c3..35fb0db9a444 100644 --- a/doc/languages-frameworks/texlive.section.md +++ b/doc/languages-frameworks/texlive.section.md @@ -183,7 +183,7 @@ let ''; meta = { - description = "A LaTeX2e class for overhead transparencies"; + description = "LaTeX2e class for overhead transparencies"; license = lib.licenses.unfreeRedistributable; maintainers = with lib.maintainers; [ veprbl ]; platforms = lib.platforms.all; diff --git a/doc/stdenv/meta.chapter.md b/doc/stdenv/meta.chapter.md index e6de030ff9c1..c8dd47533801 100644 --- a/doc/stdenv/meta.chapter.md +++ b/doc/stdenv/meta.chapter.md @@ -5,7 +5,7 @@ Nix packages can declare *meta-attributes* that contain information about a pack ```nix { meta = { - description = "A program that produces a familiar, friendly greeting"; + description = "Program that produces a familiar, friendly greeting"; longDescription = '' GNU Hello is a program that prints "Hello, world!" when you run it. It is fully customizable. From 14b378d7b068e8b1fd706ed22b1b269c5dbf08ff Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Mon, 15 Jul 2024 14:54:57 +0200 Subject: [PATCH 183/206] virtiofsd: 1.11.0 -> 1.11.1 --- pkgs/servers/misc/virtiofsd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/misc/virtiofsd/default.nix b/pkgs/servers/misc/virtiofsd/default.nix index 53fc114f078c..4835f4699835 100644 --- a/pkgs/servers/misc/virtiofsd/default.nix +++ b/pkgs/servers/misc/virtiofsd/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "virtiofsd"; - version = "1.11.0"; + version = "1.11.1"; src = fetchFromGitLab { owner = "virtio-fs"; repo = "virtiofsd"; rev = "v${version}"; - hash = "sha256-dgGdSnMsz/6dggZXh5crwHEoVVIlcUIHMH5MSOO29TE="; + hash = "sha256-4GX+qqnrUuG6jsdnKU/67YOj0X8qyuPIQbPSkE3xTBo="; }; separateDebugInfo = true; - cargoHash = "sha256-u7mzViTc0f4vApmmRNl6NkJlMfKeWSO0yupBt6adiag="; + cargoHash = "sha256-41pgoX/nGLEbMDJvdZt2HvrVMZPXqH6SWgow7A3rTBY="; LIBCAPNG_LIB_PATH = "${lib.getLib libcap_ng}/lib"; LIBCAPNG_LINK_TYPE = From 29934c94085540f2b4683816c6cbd27d8400ff53 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 6 Jul 2024 10:02:14 +0200 Subject: [PATCH 184/206] llvm: fix broken llvm-config-native for canExecute MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Since a0b4b85bfaf0 ("llvm: Avoid cross compiling if the build platform can execute host binaries"), the flags to get a working llvm-config-native are not used when the build platform can execute host binaries, resulting in a broken llvm-config-native, and therefore a broken mesa, but since build can execute host, we don't need a separate llvm-config-native at all — we can just use the normal llvm-config. Fixes: a0b4b85bfaf0 ("llvm: Avoid cross compiling if the build platform can execute host binaries") --- pkgs/development/compilers/llvm/common/llvm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/common/llvm/default.nix b/pkgs/development/compilers/llvm/common/llvm/default.nix index f780c87d0e4b..5a8346875f24 100644 --- a/pkgs/development/compilers/llvm/common/llvm/default.nix +++ b/pkgs/development/compilers/llvm/common/llvm/default.nix @@ -417,9 +417,11 @@ stdenv.mkDerivation (rec { + optionalString (stdenv.isDarwin && enableSharedLibraries) '' ln -s $lib/lib/libLLVM.dylib $lib/lib/libLLVM-${release_version}.dylib '' - + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) '' + + optionalString (stdenv.buildPlatform != stdenv.hostPlatform) (if stdenv.buildPlatform.canExecute stdenv.hostPlatform then '' + ln -s $dev/bin/llvm-config $dev/bin/llvm-config-native + '' else '' cp NATIVE/bin/llvm-config $dev/bin/llvm-config-native - ''; + ''); inherit doCheck; From 9e59b233691cb83269197a345a90fb56c067603d Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Jun 2024 15:16:48 +0200 Subject: [PATCH 185/206] linuxPackages_latest.rust-out-of-tree-module.updateScript: init Added a version to the package to make the update script happy. --- pkgs/os-specific/linux/rust-out-of-tree-module/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix index 46ae88abb37d..bfe59c0e6fe8 100644 --- a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix +++ b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix @@ -1,6 +1,7 @@ -{ lib, fetchFromGitHub, kernel }: +{ lib, fetchFromGitHub, kernel, unstableGitUpdater }: kernel.stdenv.mkDerivation { - name = "rust-out-of-tree-module"; + pname = "rust-out-of-tree-module"; + version = "0-unstable-2023-08-29"; src = fetchFromGitHub { owner = "Rust-for-linux"; @@ -16,6 +17,8 @@ kernel.stdenv.mkDerivation { installFlags = [ "INSTALL_MOD_PATH=${placeholder "out"}" ]; installTargets = [ "modules_install" ]; + passthru.updateScript = unstableGitUpdater { }; + meta = { broken = !kernel.withRust; description = "Basic template for an out-of-tree Linux kernel module written in Rust"; From 64b7de15d30e8f88de4cee0db401c6a0098b92f4 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 16 Jun 2024 15:17:44 +0200 Subject: [PATCH 186/206] linuxPackages_latest.rust-out-of-tree-module: 0-unstable-2023-08-29 -> 0-unstable-2024-05-06 Updated for breaking changes in Linux 6.10. --- pkgs/os-specific/linux/rust-out-of-tree-module/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix index bfe59c0e6fe8..ba0bd561d597 100644 --- a/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix +++ b/pkgs/os-specific/linux/rust-out-of-tree-module/default.nix @@ -1,14 +1,14 @@ { lib, fetchFromGitHub, kernel, unstableGitUpdater }: kernel.stdenv.mkDerivation { pname = "rust-out-of-tree-module"; - version = "0-unstable-2023-08-29"; + version = "0-unstable-2024-05-06"; src = fetchFromGitHub { owner = "Rust-for-linux"; repo = "rust-out-of-tree-module"; - rev = "7addf9dafba795524f6179a557f7272ecbe1b165"; - hash = "sha256-Bj7WonZ499W/FajbxjM7yBkU9iTxTW7CrRbCSzWbsSc="; + rev = "9872947486bb8f60b0d11db15d546a3d06156ec5"; + hash = "sha256-TzCySY7uQac98dU+Nu5dC4Usm7oG0iIdZZmZgAOpni4="; }; nativeBuildInputs = kernel.moduleBuildDependencies; From 768070f0c1b0720c8c0c55b295a4de7cd3db59d4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 08:13:20 +0000 Subject: [PATCH 187/206] androidStudioPackages.beta: 2024.1.1.10 -> 2024.1.2.9 --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index d7b64de97cf2..ddb6ce29f562 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,8 +13,8 @@ let sha256Hash = "sha256-2PqOz+QVtEUTNQkBUB4qD0KcoDPPGAUFSxyBbEpwRWU="; }; betaVersion = { - version = "2024.1.1.10"; # "Android Studio Koala | 2024.1.1 RC 2" - sha256Hash = "sha256-84CpZfoAvJHUCO3ZBJqDbuz9xuGE/5xJfXoetJDXju8="; + version = "2024.1.2.9"; # "Android Studio Koala Feature Drop | 2024.1.2 Beta 1" + sha256Hash = "sha256-eTnpU9KrquW4nMRqde9PUmVQ05kf6kFy1yr+Ima9M50="; }; latestVersion = { version = "2024.1.2.8"; # "Android Studio Koala Feature Drop | 2024.1.2 Canary 8" From e160c28cccec5ded3c2303b58afd6c4f6fad2836 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 09:28:18 +0000 Subject: [PATCH 188/206] erigon: 2.60.2 -> 2.60.4 --- pkgs/applications/blockchains/erigon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index d2b90cf5952f..64d12a2fdab2 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.60.2"; + version = "2.60.4"; in buildGoModule { inherit pname version; @@ -11,7 +11,7 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - hash = "sha256-+KUe+wpcE59Y6ktDRpoMXQYSML9sfN4OaDV8+sKfzQQ="; + hash = "sha256-qcBKWwF9/i9ipE70+5AG5cuhYYqDBXAlY2OWxIh4KfU="; fetchSubmodules = true; }; From d63af425e9721d68745e7bd324c3734dcb505fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 20 Jul 2024 12:16:40 +0200 Subject: [PATCH 189/206] osu-lazer-bin: 2024.718.0 -> 2024.718.1 --- pkgs/games/osu-lazer/bin.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/osu-lazer/bin.nix b/pkgs/games/osu-lazer/bin.nix index 7496514d2a1d..b575c1953c5f 100644 --- a/pkgs/games/osu-lazer/bin.nix +++ b/pkgs/games/osu-lazer/bin.nix @@ -7,22 +7,22 @@ let pname = "osu-lazer-bin"; - version = "2024.718.0"; + version = "2024.718.1"; src = { aarch64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Apple.Silicon.zip"; - hash = "sha256-XYsfNFnBUzAfiW8WdJvJcd5ufP7a60Fsi8rU9Ul3ax4="; + hash = "sha256-23ZS2lkVDNpaWKkRMrkMwPhCaudoMxehV+k/7wXHnJ0="; stripRoot = false; }; x86_64-darwin = fetchzip { url = "https://github.com/ppy/osu/releases/download/${version}/osu.app.Intel.zip"; - hash = "sha256-rs91+IbYlmtU3NY2EGqqlS/35oU4wFbWJmvyObYF32M="; + hash = "sha256-1ZYPnxyknm7cxPW4CmzE1G652CSC0jKI2g4+yHg7HsE="; stripRoot = false; }; x86_64-linux = fetchurl { url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage"; - hash = "sha256-K8YeiHuEfwK/DG+e9VSj9arJ5x5XvwIwEiAi/JFdqMM="; + hash = "sha256-+udJYFOTAUNaQnOTzqwvSm2ryDJ+AfJfQ4hths6aEYs="; }; }.${stdenv.system} or (throw "${pname}-${version}: ${stdenv.system} is unsupported."); From 243cd1b556785ae00f081ff38c1a9b8a682a5daa Mon Sep 17 00:00:00 2001 From: Benedikt Hiemer Date: Sat, 20 Jul 2024 12:14:32 +0200 Subject: [PATCH 190/206] vscode-extensions.42crunch.vscode-openapi: 4.25.3 -> 4.27.0 - Changelog: https://github.com/42Crunch/vscode-openapi/blob/master/CHANGELOG.md#version-4270-june-27-2024 - Comparing changes: https://github.com/42Crunch/vscode-openapi/compare/v4.25.3...v4.27.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 66b3362cc9c4..b46ea0a13410 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -90,8 +90,8 @@ let mktplcRef = { publisher = "42Crunch"; name = "vscode-openapi"; - version = "4.25.3"; - hash = "sha256-1kz/M2od2gLSFgqW6LsPHgtm+BwXA+0+7z3HyqNmsOg="; + version = "4.27.0"; + hash = "sha256-urXGyHpIDWQ0Bc+8LODC0DcEo6jQ5tA/QptyxCej9yU="; }; meta = { changelog = "https://marketplace.visualstudio.com/items/42Crunch.vscode-openapi/changelog"; From 6477b404f05e53f9c151f977fd7f0f61d0c13416 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Sat, 20 Jul 2024 12:32:06 +0200 Subject: [PATCH 191/206] osu-lazer: 2024.718.0 -> 2024.718.1 --- pkgs/games/osu-lazer/default.nix | 4 ++-- pkgs/games/osu-lazer/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 2d49d9dbd0a6..bee4b288aa98 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -17,13 +17,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2024.718.0"; + version = "2024.718.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - hash = "sha256-/JO/kGFhqzDBnkqLqoj1fM+0WRI1ipUaMKZQBtZPFLU="; + hash = "sha256-A3zBYdsOf/Ht15saRQtdNi1ZTnDRcAPWeSelXg6EeaI="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index 7c505b78e194..2e7f38d41dcc 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -136,13 +136,13 @@ (fetchNuGet { pname = "ppy.ManagedBass.Fx"; version = "2022.1216.0"; hash = "sha256-VfIbFhCDsCRZW5bCbt8MSmE2kAlcKxxx6vdFOus4he8="; }) (fetchNuGet { pname = "ppy.ManagedBass.Mix"; version = "2022.1216.0"; hash = "sha256-qUEGJHoYfDvHrpuXdVaiSoV2iVVh9X0yEB41u96+q6A="; }) (fetchNuGet { pname = "ppy.ManagedBass.Wasapi"; version = "2022.1216.0"; hash = "sha256-HzhypEVJA+6h3aBB95zNeGbmzEIRc5435Eh9nYpjVkA="; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.716.0"; hash = "sha256-XC6wujQvoj2f9KMkJmdN7H0iT8dO9n48VJXnrtQ59sM="; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2024.720.0"; hash = "sha256-OL78drEPNhpcfeR7rPIe4egGdNg/ADRF2wfD0Hfz21A="; }) (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2024.326.0-nativelibs"; hash = "sha256-smHbz5/uBrY7cLKOOClrrVv0MyWNYQz6T9kmIv5DfZM="; }) (fetchNuGet { pname = "ppy.osu.Framework.SourceGeneration"; version = "2023.720.0"; hash = "sha256-XXV/qBJ9vEVF15fcOlDyoJ8j47azuSJaXHEgsn3fOwA="; }) (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2024.713.0"; hash = "sha256-wdIvhPpSQHKUidy5bP6EFMJLIK5/uL3Pqv6aXGe1Swg="; }) (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.211"; hash = "sha256-Xu4uiYs1pqIXcBWeTBIc8OIqbLmH6MvaY6Dim4ZNikg="; }) (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.741-alpha"; hash = "sha256-sdX+MoMlIPUyi4yEUVHtqxKWF/VK04e2VaUavmgBEJU="; }) - (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.528.0"; hash = "sha256-P43ZV1rzMI+t8S65yBABl9Knp2EHcPkh/Yv1VcAn6Jg="; }) + (fetchNuGet { pname = "ppy.SDL3-CS"; version = "2024.717.0"; hash = "sha256-duH4pLfI6IhTjA+abiOE57e7J41AP7+8ba09rIat1Pg="; }) (fetchNuGet { pname = "ppy.Veldrid"; version = "4.9.58-gfe61932a71"; hash = "sha256-+fZB3EJpXQPolB13mRNglznpUXgCh82MqymkCjteTPg="; }) (fetchNuGet { pname = "ppy.Veldrid.MetalBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-BejLZdoBRcqCgoiHWi/vSr2apyxnpZ95tYjN9hj9ox4="; }) (fetchNuGet { pname = "ppy.Veldrid.OpenGLBindings"; version = "4.9.58-gfe61932a71"; hash = "sha256-f1a/pHOWs0S5sWsiTRW1KUdqEpA1WVO+d96bdagt0eA="; }) From cad8d8bf430197ab27896d91202f150fe70b3626 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 12:02:04 +0000 Subject: [PATCH 192/206] silice: 0-unstable-2024-06-23 -> 0-unstable-2024-07-15 --- pkgs/development/compilers/silice/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/silice/default.nix b/pkgs/development/compilers/silice/default.nix index fd3d0ba1538d..4256f589649b 100644 --- a/pkgs/development/compilers/silice/default.nix +++ b/pkgs/development/compilers/silice/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "silice"; - version = "0-unstable-2024-06-23"; + version = "0-unstable-2024-07-15"; src = fetchFromGitHub { owner = "sylefeb"; repo = "silice"; - rev = "5ba9ef0d03b3c8d4a43efe10acfb51c97d3679ef"; - hash = "sha256-LrLUaCpwzaxH02TGyEfARIumPi0s2REc1g79fSxJjFc="; + rev = "80980cff659839fca63859be4565597053a82a3c"; + hash = "sha256-G+ExPdkhMdC3m9TBwr+3Oj2K6np5MaUULgiXq0G0rLs="; fetchSubmodules = true; }; From c774c7bffe0d5fbf3da5c61e9b8bc3a8d8b11cf7 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 20 Jul 2024 12:02:30 +0000 Subject: [PATCH 193/206] cudaPackages.writeGpuTestPython: allow a selector for `libraries` to accommodate different python versions --- .../cuda-modules/write-gpu-python-test.nix | 28 +++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/pkgs/development/cuda-modules/write-gpu-python-test.nix b/pkgs/development/cuda-modules/write-gpu-python-test.nix index 5f0d5c6b8fe6..10b10fa3f923 100644 --- a/pkgs/development/cuda-modules/write-gpu-python-test.nix +++ b/pkgs/development/cuda-modules/write-gpu-python-test.nix @@ -2,16 +2,40 @@ lib, writers, runCommand, + python3Packages, }: { feature ? "cuda", name ? feature, - libraries ? [ ], + libraries ? [ ], # [PythonPackage] | (PackageSet -> [PythonPackage]) }: + +let + inherit (builtins) isFunction all; + librariesFun = if isFunction libraries then libraries else (_: libraries); +in + +assert lib.assertMsg ( + isFunction libraries || all (python3Packages.hasPythonModule) libraries +) "writeGpuTestPython was passed `libraries` from the wrong python release"; + content: let - tester = writers.writePython3Bin "tester-${name}" { inherit libraries; } content; + interpreter = python3Packages.python.withPackages librariesFun; + tester = + runCommand "tester-${name}" + { + inherit content; + passAsFile = [ "content" ]; + } + '' + mkdir -p "$out"/bin + cat << EOF >"$out"/bin/"tester-${name}" + #!${lib.getExe interpreter} + EOF + cat "$contentPath" >>"$out"/bin/"tester-${name}" + ''; tester' = tester.overrideAttrs (oldAttrs: { passthru.gpuCheck = runCommand "test-${name}" From 2d5e573acf2af54df6a8d6bcc4dc5dce639b2d72 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 20 Jul 2024 12:03:36 +0000 Subject: [PATCH 194/206] cudaPackages.writeGpuTestPython: sync the attr and the filesystem paths --- .../{write-gpu-python-test.nix => write-gpu-test-python.nix} | 0 pkgs/top-level/cuda-packages.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/cuda-modules/{write-gpu-python-test.nix => write-gpu-test-python.nix} (100%) diff --git a/pkgs/development/cuda-modules/write-gpu-python-test.nix b/pkgs/development/cuda-modules/write-gpu-test-python.nix similarity index 100% rename from pkgs/development/cuda-modules/write-gpu-python-test.nix rename to pkgs/development/cuda-modules/write-gpu-test-python.nix diff --git a/pkgs/top-level/cuda-packages.nix b/pkgs/top-level/cuda-packages.nix index 5540b89f1b98..639fa70446be 100644 --- a/pkgs/top-level/cuda-packages.nix +++ b/pkgs/top-level/cuda-packages.nix @@ -81,7 +81,7 @@ let nccl = final.callPackage ../development/cuda-modules/nccl { }; nccl-tests = final.callPackage ../development/cuda-modules/nccl-tests { }; - writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-python-test.nix { }; + writeGpuTestPython = final.callPackage ../development/cuda-modules/write-gpu-test-python.nix { }; }); mkVersionedPackageName = From 904c5631f5506b90d3b72a34b0a73cfc92bc0290 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Sat, 20 Jul 2024 00:33:29 -0400 Subject: [PATCH 195/206] gnome-font-viewer: fix build with clang 16 --- pkgs/by-name/gn/gnome-font-viewer/package.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/by-name/gn/gnome-font-viewer/package.nix b/pkgs/by-name/gn/gnome-font-viewer/package.nix index ddb98b787099..c97bad1879b8 100644 --- a/pkgs/by-name/gn/gnome-font-viewer/package.nix +++ b/pkgs/by-name/gn/gnome-font-viewer/package.nix @@ -1,5 +1,6 @@ { lib , stdenv +, fetchpatch2 , meson , ninja , gettext @@ -25,6 +26,14 @@ stdenv.mkDerivation rec { hash = "sha256-WS9AHkhdAswETUh7tcjgTJYdpoViFnaKWfH/mL0tU3w="; }; + patches = lib.optionals stdenv.cc.isClang [ + # Fixes an incompatible function pointer error when building with clang 16 + (fetchpatch2 { + url = "https://gitlab.gnome.org/GNOME/gnome-font-viewer/-/commit/565d795731471c27542bb9ee60820a2d0d15534e.diff"; + hash = "sha256-8dgOVTx6ZbvXROlIWTZU2xNWJ11LlJykRs699cgZqow="; + }) + ]; + doCheck = true; nativeBuildInputs = [ From e863b5843a3223998adf3f634aa1e6e7af0db6d4 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 20 Jul 2024 13:05:15 +0000 Subject: [PATCH 196/206] cudaPackages.writeGpuTestPython: accept makeWrapperArgs --- .../cuda-modules/write-gpu-test-python.nix | 33 +++++++++++++------ 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/development/cuda-modules/write-gpu-test-python.nix b/pkgs/development/cuda-modules/write-gpu-test-python.nix index 10b10fa3f923..23282e916929 100644 --- a/pkgs/development/cuda-modules/write-gpu-test-python.nix +++ b/pkgs/development/cuda-modules/write-gpu-test-python.nix @@ -1,14 +1,15 @@ { lib, - writers, runCommand, python3Packages, + makeWrapper, }: { feature ? "cuda", - name ? feature, + name ? if feature == null then "cpu" else feature, libraries ? [ ], # [PythonPackage] | (PackageSet -> [PythonPackage]) -}: + ... +}@args: let inherit (builtins) isFunction all; @@ -25,23 +26,35 @@ let interpreter = python3Packages.python.withPackages librariesFun; tester = runCommand "tester-${name}" - { - inherit content; - passAsFile = [ "content" ]; - } + ( + lib.removeAttrs args [ + "libraries" + "name" + ] + // { + inherit content; + nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ makeWrapper ]; + passAsFile = args.passAsFile or [ ] ++ [ "content" ]; + } + ) '' mkdir -p "$out"/bin - cat << EOF >"$out"/bin/"tester-${name}" + cat << EOF >"$out/bin/$name" #!${lib.getExe interpreter} EOF - cat "$contentPath" >>"$out"/bin/"tester-${name}" + cat "$contentPath" >>"$out/bin/$name" + chmod +x "$out/bin/$name" + + if [[ -n "''${makeWrapperArgs+''${makeWrapperArgs[@]}}" ]] ; then + wrapProgram "$out/bin/$name" ''${makeWrapperArgs[@]} + fi ''; tester' = tester.overrideAttrs (oldAttrs: { passthru.gpuCheck = runCommand "test-${name}" { nativeBuildInputs = [ tester' ]; - requiredSystemFeatures = [ feature ]; + requiredSystemFeatures = lib.optionals (feature != null) [ feature ]; } '' set -e From 3b76c33407a6b09d78b70717f43a2b32eda35902 Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 20 Jul 2024 12:05:16 +0000 Subject: [PATCH 197/206] python311Packages.torch.tests.tester-*Available: unbreak for non-default python package sets --- .../python-modules/torch/mk-runtime-check.nix | 7 ++++--- pkgs/development/python-modules/torch/tests.nix | 10 +++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/torch/mk-runtime-check.nix b/pkgs/development/python-modules/torch/mk-runtime-check.nix index 14560b06f87c..61180a19aaba 100644 --- a/pkgs/development/python-modules/torch/mk-runtime-check.nix +++ b/pkgs/development/python-modules/torch/mk-runtime-check.nix @@ -1,14 +1,15 @@ { cudaPackages, feature, - torch, + libraries, versionAttr, + pythonPackages, }: -cudaPackages.writeGpuTestPython +(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; }) { inherit feature; - libraries = [ torch ]; + inherit libraries; name = "${feature}Available"; } '' diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests.nix index 76b901cbcea9..92ddccccbaeb 100644 --- a/pkgs/development/python-modules/torch/tests.nix +++ b/pkgs/development/python-modules/torch/tests.nix @@ -1,8 +1,4 @@ -{ - callPackage, - torchWithCuda, - torchWithRocm, -}: +{ callPackage }: { # To perform the runtime check use either @@ -11,11 +7,11 @@ tester-cudaAvailable = callPackage ./mk-runtime-check.nix { feature = "cuda"; versionAttr = "cuda"; - torch = torchWithCuda; + libraries = ps: [ ps.torchWithCuda ]; }; tester-rocmAvailable = callPackage ./mk-runtime-check.nix { feature = "rocm"; versionAttr = "hip"; - torch = torchWithRocm; + libraries = ps: [ ps.torchWithRocm ]; }; } From 2cc58226b0205fae68ff9266aa6edef09df06f6d Mon Sep 17 00:00:00 2001 From: Someone Serge Date: Sat, 20 Jul 2024 12:05:52 +0000 Subject: [PATCH 198/206] python3Packages.torch.tests.*compile*: init --- .../torch/mk-torch-compile-check.nix | 38 +++++++++++++++++++ .../python-modules/torch/tests.nix | 16 +++++++- 2 files changed, 53 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/python-modules/torch/mk-torch-compile-check.nix diff --git a/pkgs/development/python-modules/torch/mk-torch-compile-check.nix b/pkgs/development/python-modules/torch/mk-torch-compile-check.nix new file mode 100644 index 000000000000..268ed5297da9 --- /dev/null +++ b/pkgs/development/python-modules/torch/mk-torch-compile-check.nix @@ -0,0 +1,38 @@ +{ + cudaPackages, + feature ? null, + lib, + libraries, + name ? if feature == null then "torch-compile-cpu" else "torch-compile-${feature}", + pythonPackages, + stdenv, +}: +let + deviceStr = if feature == null then "" else '', device="cuda"''; +in +(cudaPackages.writeGpuTestPython.override { python3Packages = pythonPackages; }) + { + inherit name feature libraries; + makeWrapperArgs = [ + "--suffix" + "PATH" + ":" + "${lib.getBin stdenv.cc}/bin" + ]; + } + '' + import torch + + + @torch.compile + def opt_foo2(x, y): + a = torch.sin(x) + b = torch.cos(y) + return a + b + + + print( + opt_foo2( + torch.randn(10, 10${deviceStr}), + torch.randn(10, 10${deviceStr}))) + '' diff --git a/pkgs/development/python-modules/torch/tests.nix b/pkgs/development/python-modules/torch/tests.nix index 92ddccccbaeb..e3f2ca44ba5a 100644 --- a/pkgs/development/python-modules/torch/tests.nix +++ b/pkgs/development/python-modules/torch/tests.nix @@ -1,6 +1,6 @@ { callPackage }: -{ +rec { # To perform the runtime check use either # `nix run .#python3Packages.torch.tests.tester-cudaAvailable` (outside the sandbox), or # `nix build .#python3Packages.torch.tests.tester-cudaAvailable.gpuCheck` (in a relaxed sandbox) @@ -14,4 +14,18 @@ versionAttr = "hip"; libraries = ps: [ ps.torchWithRocm ]; }; + + compileCpu = tester-compileCpu.gpuCheck; + tester-compileCpu = callPackage ./mk-torch-compile-check.nix { + feature = null; + libraries = ps: [ ps.torch ]; + }; + tester-compileCuda = callPackage ./mk-torch-compile-check.nix { + feature = "cuda"; + libraries = ps: [ ps.torchWithCuda ]; + }; + tester-compileRocm = callPackage ./mk-torch-compile-check.nix { + feature = "rocm"; + libraries = ps: [ ps.torchWithRocm ]; + }; } From 58b9659b655cf540a66e25bcaa0ba4b0e89cf428 Mon Sep 17 00:00:00 2001 From: Randy Eckenrode Date: Fri, 19 Jul 2024 23:15:40 -0400 Subject: [PATCH 199/206] bustle: use gettext from nixpkgs The vendored gettext fails to build with clang 16 on Darwin. The gettext in nixpkgs works. --- pkgs/by-name/bu/bustle/package.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/by-name/bu/bustle/package.nix b/pkgs/by-name/bu/bustle/package.nix index 1e57c9122f8a..a6e3e6474729 100644 --- a/pkgs/by-name/bu/bustle/package.nix +++ b/pkgs/by-name/bu/bustle/package.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, buildPackages , cargo , meson , ninja @@ -9,9 +10,12 @@ , rustPlatform , rustc , wrapGAppsHook4 +, darwin +, gettext , glib , gtk4 , libadwaita +, libiconv }: stdenv.mkDerivation (finalAttrs: { @@ -32,6 +36,14 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-r29Z+6P+yuCpOBUE3vkESd15lcGXs5+ZTBiQ9nW6DJ4="; }; + env = lib.optionalAttrs stdenv.isDarwin { + # Set the location to gettext to ensure the nixpkgs one on Darwin instead of the vendored one. + # The vendored gettext does not build with clang 16. + GETTEXT_BIN_DIR = "${lib.getBin buildPackages.gettext}/bin"; + GETTEXT_INCLUDE_DIR = "${lib.getDev gettext}/include"; + GETTEXT_LIB_DIR = "${lib.getLib gettext}/lib"; + }; + nativeBuildInputs = [ cargo meson @@ -48,6 +60,9 @@ stdenv.mkDerivation (finalAttrs: { glib gtk4 libadwaita + ] ++ lib.optionals stdenv.isDarwin [ + darwin.apple_sdk.frameworks.Foundation + libiconv ]; meta = with lib; { From 88cf071fb903118e21b1d2aae996ad3f4a36f215 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 05:12:21 +0000 Subject: [PATCH 200/206] vscodium: 1.90.2.24171 -> 1.91.1.24193 --- pkgs/applications/editors/vscode/vscodium.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index c1f275b6911e..072c1a1ca5c5 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "01riva442l78d8dyh0wb9iqhjfa1bd48bpc7zfvd4zpz6fwhlkqr"; - x86_64-darwin = "1pmvjxagbfrp25i4s66j892xiskrld5z25mkvlsdkddqlvnhanc9"; - aarch64-linux = "1lk1p45ibph3arbb5vgkgxlip2jafgmpq40ldpfrh55k6v83zd2q"; - aarch64-darwin = "17cd0grmplvk8s5wrcd1v172irrddjcc9drfp7qpvszd3kiy09a7"; - armv7l-linux = "1636i9b4fxh2jvakjag38ij6kmj1cf0nlfzyk5rfl06i06gfd6jr"; + x86_64-linux = "0am2g0vpb2fgqqs9m5v9dx8w47l2xnjy7bf3rr0bjr4yv4qn7g0n"; + x86_64-darwin = "0520kpdfa2k1qlgnmnzisbbq0n4h119nfgnaljymsviw1ix02v7k"; + aarch64-linux = "0r6sqyfcj3qs2iqpfhdjcd8jfazkmyxx0f92qpxlc6a5gllm3hlj"; + aarch64-darwin = "03b0akbkmqp1fm6i61dx09lln8m3598xigi4wr0rkdsy0yq2vpl8"; + armv7l-linux = "1sdml7bhrrn2qskhzs4ymibq7cw4nhjimxi8fmaj94dk5yri4wd3"; }.${system} or throwSystem; sourceRoot = lib.optionalString (!stdenv.isDarwin) "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.90.2.24171"; + version = "1.91.1.24193"; pname = "vscodium"; executableName = "codium"; From 8afba669e2a9c116f06e8852495a71cb2462343d Mon Sep 17 00:00:00 2001 From: Arian van Putten Date: Tue, 7 May 2024 22:46:23 +0200 Subject: [PATCH 201/206] nixos/wrappers: use normal mount for /run/wrappers We want to get rid of specialFileSystems / earlyMountScript eventually and there is no need to run this before systemd anymore now that the wrappers themselves are set up in a systemd unit since https://github.com/NixOS/nixpkgs/pull/263203 Also this is needed to make soft-reboot work. We want to make sure that we remount /run/wrappers with the nosuid bit removed on soft-reboot but because @earlyMountScript@ happens in initrd, this wouldn't happen --- nixos/modules/security/wrappers/default.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/nixos/modules/security/wrappers/default.nix b/nixos/modules/security/wrappers/default.nix index 606b620ef120..b5dae96d79c6 100644 --- a/nixos/modules/security/wrappers/default.nix +++ b/nixos/modules/security/wrappers/default.nix @@ -255,11 +255,6 @@ in umount = mkSetuidRoot "${lib.getBin pkgs.util-linux}/bin/umount"; }; - boot.specialFileSystems.${parentWrapperDir} = { - fsType = "tmpfs"; - options = [ "nodev" "mode=755" "size=${config.security.wrapperDirSize}" ]; - }; - # Make sure our wrapperDir exports to the PATH env variable when # initializing the shell environment.extraInit = '' @@ -275,6 +270,17 @@ in mrpx ${wrap.source}, '') wrappers; + systemd.mounts = [{ + where = parentWrapperDir; + what = "tmpfs"; + type = "tmpfs"; + options = lib.concatStringsSep "," ([ + "nodev" + "mode=755" + "size=${config.security.wrapperDirSize}" + ]); + }]; + systemd.services.suid-sgid-wrappers = { description = "Create SUID/SGID Wrappers"; wantedBy = [ "sysinit.target" ]; From 28555fca2a873315cf415523da6e7f1bd9fd9964 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:43:32 +0000 Subject: [PATCH 202/206] xdg-desktop-portal-xapp: 1.0.7 -> 1.0.8 --- .../development/libraries/xdg-desktop-portal-xapp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix index 8675bab269c0..d8659de53782 100644 --- a/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix +++ b/pkgs/development/libraries/xdg-desktop-portal-xapp/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "xdg-desktop-portal-xapp"; - version = "1.0.7"; + version = "1.0.8"; src = fetchFromGitHub { owner = "linuxmint"; repo = "xdg-desktop-portal-xapp"; rev = version; - hash = "sha256-1Q00aEWl/mk37NcBJPgg443V1IXmNaJcSlilzvAJ1QQ="; + hash = "sha256-e8yfFL09nztFF6FZpnT0JZyPSQCPQEI76Q29V1b0gs8="; }; nativeBuildInputs = [ From 066e65c2f0c6e6bbe05efecf2d09c6ecc1227066 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 01:39:32 +0000 Subject: [PATCH 203/206] cinnamon.pix: 3.4.1 -> 3.4.2 Also enable optional brasero / colord support. https://github.com/linuxmint/pix/compare/3.4.1...3.4.2 --- pkgs/desktops/cinnamon/pix/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/cinnamon/pix/default.nix b/pkgs/desktops/cinnamon/pix/default.nix index 8d74bdbe7122..ca16fe960dca 100644 --- a/pkgs/desktops/cinnamon/pix/default.nix +++ b/pkgs/desktops/cinnamon/pix/default.nix @@ -4,6 +4,8 @@ , pkg-config , meson , ninja +, brasero +, colord , exiv2 , libheif , libjpeg @@ -17,10 +19,10 @@ , gsettings-desktop-schemas , librsvg , libwebp +, libX11 , lcms2 , bison , flex -, clutter-gtk , wrapGAppsHook3 , shared-mime-info , python3 @@ -31,13 +33,13 @@ stdenv.mkDerivation rec { pname = "pix"; - version = "3.4.1"; + version = "3.4.2"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - sha256 = "sha256-QkgjUzoBOXE3mxXy/Lq3YkHq7f9oE97FeP7PHIBDHvc="; + sha256 = "sha256-Ra+5hXSNPRc2LvTeEYwg1xSnIYgrpfvTrpPwzuTXhdU="; }; nativeBuildInputs = [ @@ -53,7 +55,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - clutter-gtk + brasero + colord exiv2 glib gsettings-desktop-schemas @@ -72,6 +75,7 @@ stdenv.mkDerivation rec { libsecret libtiff libwebp + libX11 xapp ]; From de83d38d29d9d2634c5c7a66ff95f10ad2e6d32c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 02:05:02 +0000 Subject: [PATCH 204/206] cinnamon.cinnamon-session: 6.2.0 -> 6.2.1 --- pkgs/desktops/cinnamon/cinnamon-session/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/cinnamon/cinnamon-session/default.nix b/pkgs/desktops/cinnamon/cinnamon-session/default.nix index a7262b2f937c..835e4af12b58 100644 --- a/pkgs/desktops/cinnamon/cinnamon-session/default.nix +++ b/pkgs/desktops/cinnamon/cinnamon-session/default.nix @@ -32,13 +32,13 @@ let in stdenv.mkDerivation rec { pname = "cinnamon-session"; - version = "6.2.0"; + version = "6.2.1"; src = fetchFromGitHub { owner = "linuxmint"; repo = pname; rev = version; - hash = "sha256-2KQJNUc/uvbXnqqV0Yt3cltTHNbCo+wK67NXlid02Sk="; + hash = "sha256-mr+QOFogzoloasGt1uK6zH/KHuH+uWYzXAZxPYkW57A="; }; patches = [ From 595151c300fb8d3b9f7be552d9552e0016ab77f0 Mon Sep 17 00:00:00 2001 From: A1ca7raz <7345998+A1ca7raz@users.noreply.github.com> Date: Sat, 20 Jul 2024 22:01:38 +0800 Subject: [PATCH 205/206] applet-window-buttons6: init at 0.13.0 --- pkgs/kde/default.nix | 1 + .../applet-window-buttons6/default.nix | 44 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 pkgs/kde/third-party/applet-window-buttons6/default.nix diff --git a/pkgs/kde/default.nix b/pkgs/kde/default.nix index 6fd2d2232c5d..6f80e4eaadb4 100644 --- a/pkgs/kde/default.nix +++ b/pkgs/kde/default.nix @@ -61,6 +61,7 @@ libmediawiki = null; alpaka = self.callPackage ./misc/alpaka {}; + applet-window-buttons6 = self.callPackage ./third-party/applet-window-buttons6 {}; kdiagram = self.callPackage ./misc/kdiagram {}; kdsoap-ws-discovery-client = self.callPackage ./misc/kdsoap-ws-discovery-client {}; kirigami-addons = self.callPackage ./misc/kirigami-addons {}; diff --git a/pkgs/kde/third-party/applet-window-buttons6/default.nix b/pkgs/kde/third-party/applet-window-buttons6/default.nix new file mode 100644 index 000000000000..3f157eb2f5b0 --- /dev/null +++ b/pkgs/kde/third-party/applet-window-buttons6/default.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, cmake +, extra-cmake-modules +, kcoreaddons +, kdeclarative +, kdecoration +, libplasma +}: + +stdenv.mkDerivation rec { + pname = "applet-window-buttons6"; + version = "0.13.0"; + + src = fetchFromGitHub { + owner = "moodyhunter"; + repo = "applet-window-buttons6"; + rev = "v${version}"; + hash = "sha256-S7JcDPo4QDqi/RtvreFNoPKwTg14bgaFGsuGSDxs5nM="; + }; + + dontWrapQtApps = true; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kcoreaddons + kdeclarative + kdecoration + libplasma + ]; + + meta = with lib; { + description = "Plasma 6 applet in order to show window buttons in your panels"; + homepage = "https://github.com/moodyhunter/applet-window-buttons6"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ A1ca7raz ]; + }; +} From e79bacd1e736ce27f576b9ce2c8d76d779f613eb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Jul 2024 17:07:14 +0000 Subject: [PATCH 206/206] iosevka: 30.3.2 -> 30.3.3 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index b684843c34a2..64da2cb722a6 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "30.3.2"; + version = "30.3.3"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-Ksd1REqCe+42hpIwikIeKNYIYaHc5hqxuny8lYRuQcY="; + hash = "sha256-vbtcnBj+mYqUBUpyDXDjoz1elL5xPybZ60DBA3iFRME="; }; - npmDepsHash = "sha256-8IyQK1eoVwq6E/HZkavLSRXiZst3LuyDIPc8D/yMD9E="; + npmDepsHash = "sha256-5PTwvwGQKIL22BDq252DGddsXodaYlXUr0PiejFW+28="; nativeBuildInputs = [ remarshal