From d1890aee144a04fcd93d4b0d848917d1e92c0e5d Mon Sep 17 00:00:00 2001 From: Ulrik Strid Date: Thu, 24 Mar 2022 14:22:42 +0100 Subject: [PATCH 01/27] ocamlPackages.caqti: 1.5.1 -> 1.7.0 --- pkgs/development/ocaml-modules/caqti/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/caqti/default.nix b/pkgs/development/ocaml-modules/caqti/default.nix index d9606cda1fa3..e8367402cad2 100644 --- a/pkgs/development/ocaml-modules/caqti/default.nix +++ b/pkgs/development/ocaml-modules/caqti/default.nix @@ -2,7 +2,7 @@ buildDunePackage rec { pname = "caqti"; - version = "1.5.1"; + version = "1.7.0"; useDune2 = true; minimumOCamlVersion = "4.04"; @@ -11,7 +11,7 @@ buildDunePackage rec { owner = "paurkedal"; repo = "ocaml-${pname}"; rev = "v${version}"; - sha256 = "1vl61kdyj89whc3mh4k9bis6rbj9x2scf6hnv9afyalp4j65sqx1"; + sha256 = "sha256-NGK38so6ZVCRbtV3ww1u31EFAjkHgDdsFfFUwc8ldm4="; }; nativeBuildInputs = [ cppo ]; From 5113bd5f12995611089c6d13f41e3da776b6c5e9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Apr 2022 02:45:18 +0000 Subject: [PATCH 02/27] python310Packages.azure-keyvault: 4.1.0 -> 4.2.0 --- pkgs/development/python-modules/azure-keyvault/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 8a4799c688b4..5a30e3a48efd 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "azure-keyvault"; - version = "4.1.0"; + version = "4.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "69002a546921a8290eb54d9a3805cfc515c321bc1d4c0bfcfb463620245eca40"; + sha256 = "sha256-cxrdEIo+KatP1QGjxHclbChsNNCZazg/tqOUVGKTN2E="; }; propagatedBuildInputs = [ From 60b3a8988f02ca145bdadd8ef15c8d806ff1de22 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 1 Apr 2022 21:36:49 +0000 Subject: [PATCH 03/27] goaccess: 1.5.5 -> 1.5.6 --- pkgs/tools/misc/goaccess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 0515a2bbb805..b0eea8778938 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -10,14 +10,14 @@ }: stdenv.mkDerivation rec { - version = "1.5.5"; + version = "1.5.6"; pname = "goaccess"; src = fetchFromGitHub { owner = "allinurl"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gTdmqyGJ+TipiwDtbnGFrEZjkAyNejNINlB5iZz5yTI="; + sha256 = "sha256-1yvFyTH5m+KIN/x61cbUNgweK38WFdIUDvnkFYmST9s="; }; nativeBuildInputs = [ From c48f377dd7b9793f1550804bda1e52b2fd6dfaad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Apr 2022 20:16:13 +0000 Subject: [PATCH 04/27] python310Packages.google-nest-sdm: 1.8.0 -> 1.9.0 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index acf2e734f8c3..b190d7e854e9 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.8.0"; + version = "1.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-oaUR/2G8dcQ5A4YZeLTSzyMNLI8a29pSoEtTdWvTVKE="; + sha256 = "sha256-FHa6/oWV35TPsafgEUTCuu0Rnd1/YBZF3mHOhkVuEU0="; }; propagatedBuildInputs = [ From 170f609504cdd02fef31f8cfe88534140708d3c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Apr 2022 22:51:42 +0200 Subject: [PATCH 05/27] python3Packages.azure-keyvault: update disable --- .../python-modules/azure-keyvault/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 5a30e3a48efd..6506b010c7ef 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, isPy27, fetchPypi +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi , azure-keyvault-certificates , azure-keyvault-keys , azure-keyvault-secrets @@ -7,12 +10,14 @@ buildPythonPackage rec { pname = "azure-keyvault"; version = "4.2.0"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "sha256-cxrdEIo+KatP1QGjxHclbChsNNCZazg/tqOUVGKTN2E="; + hash = "sha256-cxrdEIo+KatP1QGjxHclbChsNNCZazg/tqOUVGKTN2E="; }; propagatedBuildInputs = [ From 6e9df508370b582417e976ee75ada577f3a3483f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 2 Apr 2022 22:53:01 +0200 Subject: [PATCH 06/27] python3Packages.azure-keyvault: update input --- pkgs/development/python-modules/azure-keyvault/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/azure-keyvault/default.nix b/pkgs/development/python-modules/azure-keyvault/default.nix index 6506b010c7ef..4fedfd4cbf55 100644 --- a/pkgs/development/python-modules/azure-keyvault/default.nix +++ b/pkgs/development/python-modules/azure-keyvault/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, isPy27 +, pythonOlder , fetchPypi , azure-keyvault-certificates , azure-keyvault-keys From 6b096be49ccfaed282455f2eb0c9be216b7e4400 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Apr 2022 21:42:26 +0000 Subject: [PATCH 07/27] python310Packages.ha-philipsjs: 2.7.6 -> 2.9.0 --- pkgs/development/python-modules/ha-philipsjs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ha-philipsjs/default.nix b/pkgs/development/python-modules/ha-philipsjs/default.nix index 8bf2b5863f08..f8aecee9a67c 100644 --- a/pkgs/development/python-modules/ha-philipsjs/default.nix +++ b/pkgs/development/python-modules/ha-philipsjs/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "ha-philipsjs"; - version = "2.7.6"; + version = "2.9.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = version; - sha256 = "sha256-U5XigLFkpRoIXcFB4dpxi8pxqcmmb20sv9i9J70s0C0="; + sha256 = "sha256-B2AQoVyoG6wyE9pTWf/ASQd8iZfIrjUr078rSkoARf0="; }; propagatedBuildInputs = [ From 63f9a72fba67857e1b8467b0f96e8efb5c003700 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Apr 2022 22:39:36 +0000 Subject: [PATCH 08/27] python39Packages.elastic-apm: 6.8.1 -> 6.9.1 --- pkgs/development/python-modules/elastic-apm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/elastic-apm/default.nix b/pkgs/development/python-modules/elastic-apm/default.nix index ea14989dbb13..98e2394d0bdb 100644 --- a/pkgs/development/python-modules/elastic-apm/default.nix +++ b/pkgs/development/python-modules/elastic-apm/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { pname = "elastic-apm"; - version = "6.8.1"; + version = "6.9.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -37,7 +37,7 @@ buildPythonPackage rec { owner = "elastic"; repo = "apm-agent-python"; rev = "v${version}"; - sha256 = "sha256-bH7XCk1jPsGalFQ68rQhSyZv9nCZE+xUJyWX828PQQI="; + sha256 = "sha256-IaCl39rhsFLQwvQdPcqKruV/Mo3f7WH91UVgMG/cnOc="; }; propagatedBuildInputs = [ From 50150c52661e05b656458c5ce8acc73feec9da3d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 00:48:00 +0000 Subject: [PATCH 09/27] python310Packages.mcstatus: 9.0.3 -> 9.0.4 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index fcacc7cbf763..f2745bf3f6f8 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.0.3"; + version = "9.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "v${version}"; - hash = "sha256-ckT3eSjOgIG2/Ci9Ig6QLCrO9iMF9VyZNJy9KfHUg4A="; + hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0="; }; nativeBuildInputs = [ From 3821355aebb50d962d65384a80afe0124806b757 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 02:01:51 +0000 Subject: [PATCH 10/27] python3Packages.easygui: use README.md --- pkgs/development/python-modules/easygui/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/development/python-modules/easygui/default.nix b/pkgs/development/python-modules/easygui/default.nix index ce4d99e45177..7749c246e146 100644 --- a/pkgs/development/python-modules/easygui/default.nix +++ b/pkgs/development/python-modules/easygui/default.nix @@ -9,10 +9,6 @@ buildPythonPackage rec { sha256 = "sha256-1lP/ee4fQvY7WgkPL5jOAjNdhq2JY7POJmGAXK/pmgQ="; }; - postPatch = '' - substituteInPlace setup.py --replace README.md README.txt - ''; - propagatedBuildInputs = [ tkinter ]; From f01177be3da5329f467d4bae8c7abc56085c2765 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 02:44:39 +0000 Subject: [PATCH 11/27] metadata-cleaner: 2.1.5 -> 2.2.1 https://gitlab.com/rmnvgr/metadata-cleaner/-/blob/v2.2.1/CHANGELOG.md --- pkgs/applications/misc/metadata-cleaner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/metadata-cleaner/default.nix b/pkgs/applications/misc/metadata-cleaner/default.nix index 9602fee5b5c0..a92f79845134 100644 --- a/pkgs/applications/misc/metadata-cleaner/default.nix +++ b/pkgs/applications/misc/metadata-cleaner/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { pname = "metadata-cleaner"; - version = "2.1.5"; + version = "2.2.1"; format = "other"; @@ -26,7 +26,7 @@ python3.pkgs.buildPythonApplication rec { owner = "rmnvgr"; repo = "metadata-cleaner"; rev = "v${version}"; - hash = "sha256-G7Azeh8+OQILoYEmlIeacoDzN0NRt5NTGavYM9CH8WA="; + hash = "sha256-clCCVOoiInaxg9++GiHMLaD+k0gAvt3oOmqQ/a+WgCE="; }; nativeBuildInputs = [ From fb1494f95a3618066ca02008c3337bce41ff0061 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 03:55:33 +0000 Subject: [PATCH 12/27] rnote: 0.3.5 -> 0.4.0 https://github.com/flxzt/rnote/releases/tag/v0.4.0 --- pkgs/applications/graphics/rnote/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/rnote/default.nix b/pkgs/applications/graphics/rnote/default.nix index 624959ffa9ee..ccccca8d65c2 100644 --- a/pkgs/applications/graphics/rnote/default.nix +++ b/pkgs/applications/graphics/rnote/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, appstream-glib , desktop-file-utils , gio-sharp , glib @@ -20,22 +21,23 @@ stdenv.mkDerivation rec { pname = "rnote"; - version = "0.3.5"; + version = "0.4.0"; src = fetchFromGitHub { owner = "flxzt"; repo = "rnote"; rev = "v${version}"; - sha256 = "5g5SQJc5aopYxtHNP5T85TtcazovrveUCnMhJ90p2t4="; + sha256 = "sha256-J7IW329rWFEoB+44762DAkWA8Hq4IVmXgc+QoDQaxV0="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-vnLesWXdqNzlWNQsUVy03kfmcDNazQ1BbizQDoG1kgM="; + hash = "sha256-elXaikB/RemMxA4OXyZNQOgP1alImQMJHng5oX2j480="; }; nativeBuildInputs = [ + appstream-glib # For appstream-util desktop-file-utils # For update-desktop-database meson ninja From 879d0536cd2cdd03b83306ffaf0c9c97c804a2df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 06:33:50 +0000 Subject: [PATCH 13/27] python310Packages.PyChromecast: 10.3.0 -> 11.0.0 --- pkgs/development/python-modules/pychromecast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pychromecast/default.nix b/pkgs/development/python-modules/pychromecast/default.nix index 37ef4da7daf6..32462707cb6e 100644 --- a/pkgs/development/python-modules/pychromecast/default.nix +++ b/pkgs/development/python-modules/pychromecast/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "pychromecast"; - version = "10.3.0"; + version = "11.0.0"; format = "setuptools"; disabled = !isPy3k; @@ -18,7 +18,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyChromecast"; inherit version; - sha256 = "sha256-TrEHRG/b7YdvSMgyArYhKyIShhaKVcFrPrjt9CAPEKE="; + sha256 = "sha256-FRcjsXgRAFK2c7h2WhIMhdFurowi11V13O6+K+HrHvY="; }; propagatedBuildInputs = [ From 12c1aa29f39754c727e7ce8bf901bbe1e654f491 Mon Sep 17 00:00:00 2001 From: Johannes Schleifenbaum Date: Sun, 3 Apr 2022 08:34:04 +0200 Subject: [PATCH 14/27] libreddit: 0.22.5 -> 0.22.6 --- pkgs/servers/libreddit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/libreddit/default.nix b/pkgs/servers/libreddit/default.nix index 1661104dcef2..8274b7440691 100644 --- a/pkgs/servers/libreddit/default.nix +++ b/pkgs/servers/libreddit/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "libreddit"; - version = "0.22.5"; + version = "0.22.6"; src = fetchFromGitHub { owner = "spikecodes"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yzYmlewM9NcNHPUmfGiUP0Px2s+sagZOU82wK4973rY="; + sha256 = "sha256-Dx0eVg1T9WTHeIQO9hwUoCAcUgQey8rlZ5+uxPIX0Wc="; }; - cargoSha256 = "sha256-XZkTfpi9stW13l7yo0LFZryAPITVZa9MALrSWSei5LU="; + cargoSha256 = "sha256-RGZgo9uxRmPpZzXu6AC2FPjOoZxLnh4gCjadAOTWJ4Q="; buildInputs = lib.optional stdenv.isDarwin Security; From 6fb4383ad48c2d627e82298ec5eea7fa048900a9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 06:50:30 +0000 Subject: [PATCH 15/27] python310Packages.pysnooper: 1.1.0 -> 1.1.1 --- pkgs/development/python-modules/pysnooper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index f5675aae8ed8..f09f81f6da3b 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "1.1.0"; + version = "1.1.1"; pname = "pysnooper"; src = fetchPypi { inherit version; pname = "PySnooper"; - sha256 = "0fa932ad396d2bac089d4b1f94f0ce49cde4140ee64ddd24a4065fadea10fcc9"; + sha256 = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; }; # test dependency python-toolbox fails with py27 From e48ff4cdb06d4c161114018131d39cf305047cf5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Apr 2022 22:54:30 +0000 Subject: [PATCH 16/27] python310Packages.ipyparallel: 8.2.0 -> 8.2.1 --- pkgs/development/python-modules/ipyparallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ipyparallel/default.nix b/pkgs/development/python-modules/ipyparallel/default.nix index aa7cc22b7a84..b5d0b56bc061 100644 --- a/pkgs/development/python-modules/ipyparallel/default.nix +++ b/pkgs/development/python-modules/ipyparallel/default.nix @@ -19,11 +19,11 @@ buildPythonPackage rec { pname = "ipyparallel"; - version = "8.2.0"; + version = "8.2.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-D9n2SlEgmAqJtkKZgGwSu434zuoVXlIAtwUwHrJAHhk="; + sha256 = "sha256-8mdHPFL8aohsa4Fq2xVb7Asne8fSJPs/q+uDg05zPHI="; }; buildInputs = [ nose ]; From 884395eae0b0ea5e30976c9238c249e719a330b5 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 6 Jan 2022 19:56:03 +0800 Subject: [PATCH 17/27] zzuf: use autoreconfHook --- pkgs/tools/security/zzuf/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/zzuf/default.nix b/pkgs/tools/security/zzuf/default.nix index 5b30d5270df9..edf5e846801b 100644 --- a/pkgs/tools/security/zzuf/default.nix +++ b/pkgs/tools/security/zzuf/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, pkg-config }: +{ lib, stdenv, fetchFromGitHub, pkg-config, autoreconfHook }: stdenv.mkDerivation rec { pname = "zzuf"; @@ -11,10 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0li1s11xf32dafxq1jbnc8c63313hy9ry09dja2rymk9mza4x2n9"; }; - nativeBuildInputs = [ autoconf automake ]; - buildInputs = [ libtool pkg-config ]; - - preConfigure = "./bootstrap"; + nativeBuildInputs = [ pkg-config autoreconfHook ]; meta = with lib; { description = "Transparent application input fuzzer"; From d341a9022e847f47f7f3889227505eaac1548691 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Apr 2022 09:10:31 +0200 Subject: [PATCH 18/27] naabu: 2.0.5 -> 2.0.6 --- pkgs/tools/security/naabu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix index 5acd0a93ac22..a9a6fe29e131 100644 --- a/pkgs/tools/security/naabu/default.nix +++ b/pkgs/tools/security/naabu/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "naabu"; - version = "2.0.5"; + version = "2.0.6"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "naabu"; rev = "v${version}"; - sha256 = "0kbpfb1ryfqy8a54ksm7zm8pqy8f4adh06jc1ccpdxks3k0rygid"; + sha256 = "sha256-soYtm8vEkMJq9MeoUqOGJPWxZUrh3mGnApxG154W1wI="; }; - vendorSha256 = "17x60x68hd2jm84xw5mgsclv6phn6ajkp92kpcz013vlkcdaqrxs"; + vendorSha256 = "sha256-MR1JUbeGC4N0jDuYdwVFMHBdZEy5BkID2BFdCwjtTAg="; buildInputs = [ libpcap From 7b587ffe610266ae575400c1f6d0f259561c5cf0 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Apr 2022 18:28:48 -0700 Subject: [PATCH 19/27] jing-trang: use jdk_headless instead of jdk This allows to build the nixpkgs manual from a "headless" machine, i.e. without dragging in an entire linux desktop. --- pkgs/tools/text/xml/jing-trang/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/xml/jing-trang/default.nix b/pkgs/tools/text/xml/jing-trang/default.nix index 02f745575adb..683eecde46b9 100644 --- a/pkgs/tools/text/xml/jing-trang/default.nix +++ b/pkgs/tools/text/xml/jing-trang/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, jre_headless, jdk, ant, saxon }: +{ lib, stdenv, fetchFromGitHub, jre_headless, jdk_headless, ant, saxon }: stdenv.mkDerivation rec { pname = "jing-trang"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; - buildInputs = [ jdk ant saxon ]; + buildInputs = [ jdk_headless ant saxon ]; CLASSPATH = "lib/saxon.jar"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ae84967a7479..03c067357635 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6965,7 +6965,7 @@ with pkgs; jing = res.jing-trang; jing-trang = callPackage ../tools/text/xml/jing-trang { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + jdk_headless = jdk8_headless; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; jira-cli = callPackage ../development/tools/jira_cli { }; From 28d736ac6adcd397e24414450f838746822f25e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Apr 2022 09:15:45 +0200 Subject: [PATCH 20/27] terrascan: 1.13.2 -> 1.14.0 --- pkgs/tools/security/terrascan/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/terrascan/default.nix b/pkgs/tools/security/terrascan/default.nix index b9da8e95d3e0..02f3615233ae 100644 --- a/pkgs/tools/security/terrascan/default.nix +++ b/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.13.2"; + version = "1.14.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ja7Cpd+BegGdKOWAiH5JsniO4NYlFEgJzqBuNzE2ao4="; + sha256 = "sha256-O4oLtbijTAgUD+X3rxJkH2VmWLX5nQaN5JwoznNpKOM="; }; - vendorSha256 = "sha256-h/mSF4hJ3TS+4b3CCUEXVin8MRcPg8qEe90Mcxk0uVo="; + vendorSha256 = "sha256-dfd5yQ3t23YyFin770UlCtEIldRxTqeWfgl0GLLF+Qw="; # Tests want to download a vulnerable Terraform project doCheck = false; From f3aa17de86033e1906c05a43c89e089a2326e9fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 3 Apr 2022 09:27:41 +0200 Subject: [PATCH 21/27] python3Packages.pysnooper: disable on older Python releases - switch to pytestCheckHook - add pythonImportsCheck --- .../python-modules/pysnooper/default.nix | 20 +++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index f09f81f6da3b..370ed373da55 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -1,25 +1,29 @@ { lib , buildPythonPackage , fetchPypi -, pytest -, isPy27 +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { - version = "1.1.1"; pname = "pysnooper"; + version = "1.1.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; src = fetchPypi { inherit version; pname = "PySnooper"; - sha256 = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; + hash = "sha256-0X3JHMoVk8ECMNzkXkax0/8PiRDww46UHt9roSYLOCA="; }; - # test dependency python-toolbox fails with py27 - doCheck = !isPy27; - checkInputs = [ - pytest + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pysnooper" ]; meta = with lib; { From 5262a53dca6cfbfb46d45ed05cf2c90267e0a0dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 07:39:07 +0000 Subject: [PATCH 22/27] python310Packages.python-box: 6.0.1 -> 6.0.2 --- pkgs/development/python-modules/python-box/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-box/default.nix b/pkgs/development/python-modules/python-box/default.nix index 30666ef47064..01805c6a2d22 100644 --- a/pkgs/development/python-modules/python-box/default.nix +++ b/pkgs/development/python-modules/python-box/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "python-box"; - version = "6.0.1"; + version = "6.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "cdgriffith"; repo = "Box"; rev = version; - hash = "sha256-kH8qHAFuYDXO5Dsl6BpTYCIqh0Xi8Rbwmia+y3sTn6Y="; + hash = "sha256-IE2qyRzvrOTymwga+hCwE785sAVTqQtcN1DL/uADpbQ="; }; propagatedBuildInputs = [ From 2abee3b82bdb06430ce1131aecd24db55e4d4df4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 3 Apr 2022 03:21:41 +0000 Subject: [PATCH 23/27] newsboat: 2.26 -> 2.27 https://github.com/newsboat/newsboat/blob/r2.27/CHANGELOG.md --- .../networking/feedreaders/newsboat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/newsboat/default.nix b/pkgs/applications/networking/feedreaders/newsboat/default.nix index e746f115043b..ed5cad35474f 100644 --- a/pkgs/applications/networking/feedreaders/newsboat/default.nix +++ b/pkgs/applications/networking/feedreaders/newsboat/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "newsboat"; - version = "2.26"; + version = "2.27"; src = fetchFromGitHub { owner = "newsboat"; repo = "newsboat"; rev = "r${version}"; - hash = "sha256-VFeKj8X7gEyxsdsOK6UYJ6xB24gsuzb1Wm4GK5AJCHc="; + hash = "sha256-cHUI95Zrwzg242BM8/roA40sAxijFw6go6BbQNZSzRw="; }; - cargoHash = "sha256-pr/Vzm321/uX4fIGt3kuWrtcgsnDRbeK3AvNO19NDwQ="; + cargoHash = "sha256-YZpaPfExKNLHWHmnCery4fGAJmOhpK3umuO343qe0Zo="; # TODO: Check if that's still needed postPatch = lib.optionalString stdenv.isDarwin '' From c79c23d01756160083740fee71d9b4090e2b31e4 Mon Sep 17 00:00:00 2001 From: Adam Joseph Date: Sat, 2 Apr 2022 18:36:22 -0700 Subject: [PATCH 24/27] saxon: use jdk_headless instead of jdk This allows to build the nixpkgs manual from a "headless" machine, i.e. without dragging in an entire linux desktop. --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03c067357635..60ae4faa4391 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21044,7 +21044,10 @@ with pkgs; saxonb = saxonb_8_8; - inherit (callPackages ../development/libraries/java/saxon { }) + inherit (callPackages ../development/libraries/java/saxon { + jre = jre_headless; + jre8 = jre8_headless; + }) saxon saxonb_8_8 saxonb_9_1 From 117fe1fd2b3254e59bd4506b980b2f0a4996a722 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 3 Apr 2022 12:29:09 +0100 Subject: [PATCH 25/27] maintainers/teams: clean up cleanup team --- maintainers/team-list.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/maintainers/team-list.nix b/maintainers/team-list.nix index effcebf0d799..7d12a82d4921 100644 --- a/maintainers/team-list.nix +++ b/maintainers/team-list.nix @@ -108,15 +108,6 @@ with lib.maintainers; { shortName = "Chia Blockchain"; }; - cleanup = { - members = [ - ajs124 - ]; - scope = "Cleaning of the nixpkgs source tree."; - shortName = "Cleanup"; - enableFeatureFreezePing = true; - }; - coq = { members = [ cohencyril From 459d04132d0398b175b3915d3e4e3eb2adf1eb3e Mon Sep 17 00:00:00 2001 From: Solene Rapenne Date: Sat, 2 Apr 2022 22:22:45 +0200 Subject: [PATCH 26/27] lutris: 0.5.9.1 -> 0.5.10 --- pkgs/applications/misc/lutris/default.nix | 22 ++++---- pkgs/applications/misc/lutris/fixes.patch | 67 ----------------------- 2 files changed, 12 insertions(+), 77 deletions(-) delete mode 100644 pkgs/applications/misc/lutris/fixes.patch diff --git a/pkgs/applications/misc/lutris/default.nix b/pkgs/applications/misc/lutris/default.nix index fed9d245c190..0446c694fe0d 100644 --- a/pkgs/applications/misc/lutris/default.nix +++ b/pkgs/applications/misc/lutris/default.nix @@ -4,6 +4,7 @@ # build inputs , atk +, file , gdk-pixbuf , glib-networking , gnome-desktop @@ -17,7 +18,7 @@ # check inputs , xvfb-run -, nose +, nose2 , flake8 # python dependencies @@ -83,13 +84,13 @@ let in buildPythonApplication rec { pname = "lutris-original"; - version = "0.5.9.1"; + version = "0.5.10"; src = fetchFromGitHub { owner = "lutris"; repo = "lutris"; rev = "v${version}"; - sha256 = "sha256-ykPJneCKbFKv0x/EDo9PkRb1LkMeFeYzTDmvE3ShNe0="; + sha256 = "sha256-PrnULCdQXNZ9OTa00NVyqiTdKRRkAYBcDj7lMwEqkw4="; }; nativeBuildInputs = [ wrapGAppsHook ]; @@ -103,6 +104,7 @@ buildPythonApplication rec { libnotify pango webkitgtk + python_magic ] ++ gstDeps; propagatedBuildInputs = [ @@ -118,7 +120,13 @@ buildPythonApplication rec { python_magic ]; - checkInputs = [ xvfb-run nose flake8 ] ++ requiredTools; + postPatch = '' + substituteInPlace lutris/util/magic.py \ + --replace "'libmagic.so.1'" "'${lib.getLib file}/lib/libmagic.so.1'" + ''; + + + checkInputs = [ xvfb-run nose2 flake8 ] ++ requiredTools; preCheck = "export HOME=$PWD"; checkPhase = '' runHook preCheck @@ -126,12 +134,6 @@ buildPythonApplication rec { runHook postCheck ''; - # unhardcodes xrandr and fixes nosetests - # upstream in progress: https://github.com/lutris/lutris/pull/3754 - patches = [ - ./fixes.patch - ]; - # avoid double wrapping dontWrapGApps = true; makeWrapperArgs = [ diff --git a/pkgs/applications/misc/lutris/fixes.patch b/pkgs/applications/misc/lutris/fixes.patch deleted file mode 100644 index 42482453f6a4..000000000000 --- a/pkgs/applications/misc/lutris/fixes.patch +++ /dev/null @@ -1,67 +0,0 @@ -diff --git a/Makefile b/Makefile -index 821a9500..75affa77 100644 ---- a/Makefile -+++ b/Makefile -@@ -25,12 +25,12 @@ release: build-source upload upload-ppa - - test: - rm tests/fixtures/pga.db -f -- nosetests3 -+ nosetests - - cover: - rm tests/fixtures/pga.db -f - rm tests/coverage/ -rf -- nosetests3 --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage -+ nosetests --with-coverage --cover-package=lutris --cover-html --cover-html-dir=tests/coverage - - pgp-renew: - osc signkey --extend home:strycore -diff --git a/lutris/util/graphics/xrandr.py b/lutris/util/graphics/xrandr.py -index f788c94c..5544dbe9 100644 ---- a/lutris/util/graphics/xrandr.py -+++ b/lutris/util/graphics/xrandr.py -@@ -5,6 +5,7 @@ from collections import namedtuple - - from lutris.util.log import logger - from lutris.util.system import read_process_output -+from lutris.util.linux import LINUX_SYSTEM - - Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary", "rate")) - -@@ -12,7 +13,7 @@ Output = namedtuple("Output", ("name", "mode", "position", "rotation", "primary" - def _get_vidmodes(): - """Return video modes from XrandR""" - logger.debug("Retrieving video modes from XrandR") -- return read_process_output(["xrandr"]).split("\n") -+ return read_process_output([LINUX_SYSTEM.get("xrandr")]).split("\n") - - - def get_outputs(): # pylint: disable=too-many-locals -@@ -76,7 +77,7 @@ def turn_off_except(display): - for output in get_outputs(): - if output.name != display: - logger.info("Turning off %s", output[0]) -- subprocess.Popen(["xrandr", "--output", output.name, "--off"]) -+ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "--output", output.name, "--off"]) - - - def get_resolutions(): -@@ -111,7 +112,7 @@ def change_resolution(resolution): - logger.warning("Resolution %s doesn't exist.", resolution) - else: - logger.info("Changing resolution to %s", resolution) -- subprocess.Popen(["xrandr", "-s", resolution]) -+ subprocess.Popen([LINUX_SYSTEM.get("xrandr"), "-s", resolution]) - else: - for display in resolution: - logger.debug("Switching to %s on %s", display.mode, display.name) -@@ -128,7 +129,7 @@ def change_resolution(resolution): - logger.info("Switching resolution of %s to %s", display.name, display.mode) - subprocess.Popen( - [ -- "xrandr", -+ LINUX_SYSTEM.get("xrandr"), - "--output", - display.name, - "--mode", From f4edf20487ef7493b4f797e7b6e51c7ab332c3e3 Mon Sep 17 00:00:00 2001 From: happysalada Date: Sat, 2 Apr 2022 12:03:41 -0400 Subject: [PATCH 27/27] roapi-http: init at 0.6.0 --- pkgs/servers/roapi/http.nix | 55 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 57 insertions(+) create mode 100644 pkgs/servers/roapi/http.nix diff --git a/pkgs/servers/roapi/http.nix b/pkgs/servers/roapi/http.nix new file mode 100644 index 000000000000..775850ea32e0 --- /dev/null +++ b/pkgs/servers/roapi/http.nix @@ -0,0 +1,55 @@ +{ stdenv +, lib +, fetchurl +}: +let + pname = "roapi-http"; + version = "0.6.0"; + target = if stdenv.isDarwin then "apple-darwin" else ""; +in +# TODO build from source, currently compilation fails on darwin on snmalloc with +# ./mem/../ds/../pal/pal_apple.h:277:64: error: use of undeclared identifier 'kCCSuccess' +# reinterpret_cast(&result), sizeof(result)) != kCCSuccess) +# +# rustPlatform.buildRustPackage { +# pname = "roapi-http"; +# inherit version; + +# src = fetchFromGitHub { +# owner = "roapi"; +# repo = "roapi"; +# rev = "roapi-http-v${version}"; +# sha256 = "sha256-qHAO3h+TTCQQ7vdd4CoXVGfKZ1fIxTWKqbUNnRsJaok="; +# }; + +# cargoSha256 = "sha256-qDJKC6MXeKerPFwJsNND3WkziFtGkTvCgVEsdPbBGAo="; + +# buildAndTestSubdir = "roapi-http"; + +# nativeBuildInputs = [ cmake ]; + +stdenv.mkDerivation rec { + inherit pname version; + + src = fetchurl { + url = "https://github.com/roapi/roapi/releases/download/${pname}-v${version}/${pname}-${target}.tar.gz"; + sha256 = "sha256-lv6BHg/LkrOlyq8D1udAYW8/AbZRb344YCcVnwo3ZHk="; + }; + dontUnpack = true; + dontConfigure = true; + dontBuild = true; + + installPhase = '' + tar xvzf $src + mkdir -p "$out/bin" + cp roapi-http $out/bin + ''; + + meta = with lib; { + description = "Create full-fledged APIs for static datasets without writing a single line of code. "; + homepage = "https://roapi.github.io/docs/"; + license = licenses.asl20; + maintainers = with maintainers; [ happysalada ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60ae4faa4391..d5404dabd7c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24362,6 +24362,8 @@ with pkgs; rime-data = callPackage ../data/misc/rime-data { }; + roapi-http = callPackage ../servers/roapi/http.nix { }; + rose-pine-gtk-theme = callPackage ../data/themes/rose-pine-gtk { }; route159 = callPackage ../data/fonts/route159 { };