From 1c6697dec7b6d81b287ac67d4a79e122700c529b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 02:05:13 +0000 Subject: [PATCH 01/49] dolphin-emu-beta: 5.0-16380 -> 5.0-16793 --- pkgs/applications/emulators/dolphin-emu/master.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/dolphin-emu/master.nix b/pkgs/applications/emulators/dolphin-emu/master.nix index 63a638640800..80b01962bc9c 100644 --- a/pkgs/applications/emulators/dolphin-emu/master.nix +++ b/pkgs/applications/emulators/dolphin-emu/master.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "dolphin-emu"; - version = "5.0-16380"; + version = "5.0-16793"; src = fetchFromGitHub { owner = "dolphin-emu"; repo = "dolphin"; - rev = "8335ec70e5fe253eb21509408ca6b5736ed57dfc"; - sha256 = "sha256-WRQ3WfMTlIPoYrEFWLHL9KSfhzQl24AlkbWjh3a4fPE="; + rev = "3cd82b619388d0877436390093a6edc2319a6904"; + sha256 = "sha256-0k+kmq/jkCy52wGcmvtwmnLxUfxk3k0mvsr5wfX8p30="; fetchSubmodules = true; }; From a043195d2cf8c16dd78182577e32a9bb4c0370f9 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 31 Jul 2022 21:56:36 +0100 Subject: [PATCH 02/49] jruby: mark as sourceProvenance binaryBytecode --- pkgs/development/interpreters/jruby/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index fc49f2c73ff8..0117de90d494 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -56,6 +56,7 @@ jruby = stdenv.mkDerivation rec { license = with licenses; [ cpl10 gpl2 lgpl21 ]; platforms = platforms.unix; maintainers = [ maintainers.fzakaria ]; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; }; }; in jruby.overrideAttrs (oldAttrs: { From c7e3978e36d4f2c27e11bc766598ee1ec9672990 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 11:28:31 +0000 Subject: [PATCH 03/49] argo: 3.3.8 -> 3.3.9 --- pkgs/applications/networking/cluster/argo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index 624814c1bb65..1d799c9fe9fd 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,16 +19,16 @@ let in buildGoModule rec { pname = "argo"; - version = "3.3.8"; + version = "3.3.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "sha256-9RwUKLVf8ArDAE6ivbWqxDCCW4OjqQFEEoWHBIv/cww="; + sha256 = "sha256-BDanFiLhucNE4uvUxKDXAK1W755VfNytQ3gXuLIKfSE="; }; - vendorSha256 = "sha256-cq452XEGMVbLvfJ/UiVyOvnUSJr196owB3SyBYnAmZ0="; + vendorSha256 = "sha256-303+LE3n3lltuCf+Pc7S+qHdsjQDt9IAu9Kd4sUaiYI="; doCheck = false; From d2e257ceb3a01e5447e55739acd5e784409b658d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 14:16:54 +0000 Subject: [PATCH 04/49] fnott: 1.2.1 -> 1.3.0 --- pkgs/applications/misc/fnott/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/fnott/default.nix b/pkgs/applications/misc/fnott/default.nix index 14de4af2c85b..f01a2b5595a3 100644 --- a/pkgs/applications/misc/fnott/default.nix +++ b/pkgs/applications/misc/fnott/default.nix @@ -19,14 +19,14 @@ stdenv.mkDerivation rec { pname = "fnott"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "dnkl"; repo = "fnott"; rev = version; - sha256 = "sha256-Ni1LwsBkh+XekHEAPxoAkE3tjgUByvpLUGpx7WC54Jw="; + sha256 = "sha256-6NMMU39v8+Ir3rf7kVwBdEOuYnZC1MqtZnim8+0A7wM="; }; nativeBuildInputs = [ From 5b3aa061f217a2feb3f4af39faeacbe0986e6028 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 15:11:05 +0000 Subject: [PATCH 05/49] charm: 0.12.1 -> 0.12.3 --- pkgs/applications/misc/charm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/charm/default.nix b/pkgs/applications/misc/charm/default.nix index 61f0307f7c20..7d62c0495b3b 100644 --- a/pkgs/applications/misc/charm/default.nix +++ b/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.12.1"; + version = "0.12.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "sha256-vNy2ai1s7TKCymYznvT0Wo6lg9qEyDzz8l3SYzScz8g="; + sha256 = "sha256-FQNOU75mZqeXAVFOxTXri6bfkJZx4A/YhXMf8bFAKxs="; }; - vendorSha256 = "sha256-6PGdM7aa1BGNZc3M35PJpmrlPUqkykxfTELdgeKcJD4="; + vendorSha256 = "sha256-6Grg6/q4idhWk6slxV2GBblmOA5dclFh/PcGtPXUTd4="; ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; From 20e1a64bb80cdb3dfc0f7db539ec3a2f0dede3b2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 10 Aug 2022 23:27:53 +0000 Subject: [PATCH 06/49] skate: 0.2.0 -> 0.2.1 --- pkgs/applications/misc/skate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/skate/default.nix b/pkgs/applications/misc/skate/default.nix index 04293d78ad97..f8ccc2d3eab8 100644 --- a/pkgs/applications/misc/skate/default.nix +++ b/pkgs/applications/misc/skate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "skate"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "skate"; rev = "v${version}"; - sha256 = "sha256-glqBiwW87BwGRZGDSvvE/WeK4BKqXGmC6Q9qBk+ROuc="; + sha256 = "sha256-7ieXQM1Z4q4f37YSEcGs7sBAZH+64OCrWp7uBP5VNqI="; }; - vendorSha256 = "sha256-VQvumXQx5Q0gt51NI65kjSnzGRyScpli36vfCygtAjE="; + vendorSha256 = "sha256-/Q8T4/KaHglhdxMQg9v5H+mHZpuHFcLRAbh6CzaFJKU="; doCheck = false; From 373743476c7894d99b643dfd05984e78388f492e Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Thu, 11 Aug 2022 21:58:51 +0800 Subject: [PATCH 07/49] vivaldi: fix ffmpeg version extraction --- pkgs/applications/networking/browsers/vivaldi/update.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/update.sh b/pkgs/applications/networking/browsers/vivaldi/update.sh index caf9148805cd..ab072340173a 100755 --- a/pkgs/applications/networking/browsers/vivaldi/update.sh +++ b/pkgs/applications/networking/browsers/vivaldi/update.sh @@ -37,7 +37,7 @@ git commit -m "vivaldi: ${vivaldi_version_old} -> ${vivaldi_version}" # Check vivaldi-ffmpeg-codecs version. chromium_version_old=$(version vivaldi-ffmpeg-codecs) ffmpeg_update_script=$(bsdtar xOf "$path" data.tar.xz | bsdtar xOf - ./opt/vivaldi/update-ffmpeg) -chromium_version=$(sed -rne 's/FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script) +chromium_version=$(sed -rne 's/^FFMPEG_VERSION_DEB\=([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+).*/\1/p' <<< $ffmpeg_update_script) download_subdir=$(sed -rne 's/.*FFMPEG_URL_DEB\=https:\/\/launchpadlibrarian\.net\/([0-9]+)\/.*_amd64\.deb/\1/p' <<< $ffmpeg_update_script) if [[ "$chromium_version" != "$chromium_version_old" ]]; then From 36cbcf4001726eb66b4da08549a3d2793ae55c06 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Thu, 11 Aug 2022 21:17:59 +0530 Subject: [PATCH 08/49] zed: init at 1.2.0 --- pkgs/development/tools/zed/default.nix | 27 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/zed/default.nix diff --git a/pkgs/development/tools/zed/default.nix b/pkgs/development/tools/zed/default.nix new file mode 100644 index 000000000000..743adb561533 --- /dev/null +++ b/pkgs/development/tools/zed/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "zed"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "brimdata"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-BK4LB37jr/9O0sjYgFtnEkbFqTsp/1+hcmCNMFDPiPM="; + }; + + vendorSha256 = "sha256-oAkQRUaEP/RNjpDH4U8XFVokf7KiLk0OWMX+U7qny70="; + + subPackages = [ "cmd/zed" "cmd/zq" ]; + + meta = with lib; { + description = "A novel data lake based on super-structured data"; + homepage = "https://github.com/brimdata/zed"; + license = licenses.bsd3; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 359aff33b8ae..c68c341316d4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12367,6 +12367,8 @@ with pkgs; zdelta = callPackage ../tools/compression/zdelta { }; + zed = callPackage ../development/tools/zed { }; + zellij = callPackage ../tools/misc/zellij { inherit (darwin.apple_sdk.frameworks) DiskArbitration Foundation; }; From 0d8b6ec05e884af0de893adbda4510118baabf4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 12 Aug 2022 11:04:41 +0200 Subject: [PATCH 09/49] python310Packages.aiohttp-retry: 2.7.0 -> 2.8.3 --- pkgs/development/python-modules/aiohttp-retry/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohttp-retry/default.nix b/pkgs/development/python-modules/aiohttp-retry/default.nix index f03ca026d97f..0cf747e70ba0 100644 --- a/pkgs/development/python-modules/aiohttp-retry/default.nix +++ b/pkgs/development/python-modules/aiohttp-retry/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "aiohttp-retry"; - version = "2.7.0"; + version = "2.8.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "inyutin"; repo = "aiohttp_retry"; rev = "v${version}"; - hash = "sha256-vMnk7OHXTgFLcnqauAPB/vxVt8bP1To6KTIgNv7Ek+Q="; + hash = "sha256-Zr68gx8ZR9jKrogmqaFLvpBAIHE9ptHm0zZ/b49cCLw="; }; propagatedBuildInputs = [ From e611e6d598191b1f76f9387c1d6b782e53cdb398 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 13 Aug 2022 14:32:56 +0800 Subject: [PATCH 10/49] vivaldi: 5.3.2679.70-1 -> 5.4.2753.33-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index 0d59b67c2162..c917ba5d3498 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -20,11 +20,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "5.3.2679.70-1"; + version = "5.4.2753.33-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0mcq3nbbjw5x2gjah6hbbiv233bxwi68y7nziyqpp9d6nd2pixjn"; + sha256 = "0bs6324m5l5vmg1x1sj6g3qb1958c5c8z35r87r3rpnv52lqr501"; }; unpackPhase = '' From cfd88c2e74554c7aec3940ff8bef790bbf8a0bf3 Mon Sep 17 00:00:00 2001 From: Steven Kou Date: Sat, 13 Aug 2022 14:33:12 +0800 Subject: [PATCH 11/49] vivaldi-ffmepg-codecs: 103.0.5060.53 -> 104.0.5112.79 --- .../networking/browsers/vivaldi/ffmpeg-codecs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix index e9228493de3e..a49f2fe1307a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix +++ b/pkgs/applications/networking/browsers/vivaldi/ffmpeg-codecs.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "chromium-codecs-ffmpeg-extra"; - version = "103.0.5060.53"; + version = "104.0.5112.79"; src = fetchurl { - url = "https://launchpadlibrarian.net/607589056/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; - sha256 = "sha256-Tsp5Y6sCn+mKrLGZSAWGFoSTHiyfANQ5VA7pesU1HyU="; + url = "https://launchpadlibrarian.net/616178945/${pname}_${version}-0ubuntu0.18.04.1_amd64.deb"; + sha256 = "sha256-JL14+2TsX1qXfRpA/tAADC0iujPj37ld6T9yPUD8R38="; }; buildInputs = [ dpkg ]; From d0208eadad300980fff67abc405e7508219df411 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Aug 2022 21:40:53 +0200 Subject: [PATCH 12/49] python310Packages.oci: 2.75.0 -> 2.78.0 --- pkgs/development/python-modules/oci/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/oci/default.nix b/pkgs/development/python-modules/oci/default.nix index 205cd78757e4..e136ed354e3f 100644 --- a/pkgs/development/python-modules/oci/default.nix +++ b/pkgs/development/python-modules/oci/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , certifi , circuitbreaker -, configparser , cryptography , fetchFromGitHub , pyopenssl @@ -13,7 +12,7 @@ buildPythonPackage rec { pname = "oci"; - version = "2.75.0"; + version = "2.78.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -22,13 +21,12 @@ buildPythonPackage rec { owner = "oracle"; repo = "oci-python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-dr95RHM8h2JIqkaey7E9DzbTLfLlCCUL1ZmTIH4mBRw="; + hash = "sha256-24V9vfuNMxvC5iqluW4xz7WICXbQA89xmiAH6tIDRw0="; }; propagatedBuildInputs = [ certifi circuitbreaker - configparser cryptography pyopenssl python-dateutil @@ -37,9 +35,9 @@ buildPythonPackage rec { postPatch = '' substituteInPlace setup.py \ - --replace "configparser==4.0.2 ; python_version < '3'" "configparser" \ - --replace "cryptography>=3.2.1,<=3.4.7" "cryptography" \ - --replace "pyOpenSSL>=17.5.0,<=19.1.0" "pyOpenSSL" + --replace "configparser==4.0.2 ; python_version < '3'" "" \ + --replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \ + --replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" ''; # Tests fail: https://github.com/oracle/oci-python-sdk/issues/164 From 4a57232668a92253a113a4d86d1c2a9305327c88 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Aug 2022 21:43:39 +0200 Subject: [PATCH 13/49] python310Packages.ocifs: init at 1.1.2 --- .../python-modules/ocifs/default.nix | 41 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/python-modules/ocifs/default.nix diff --git a/pkgs/development/python-modules/ocifs/default.nix b/pkgs/development/python-modules/ocifs/default.nix new file mode 100644 index 000000000000..a28ad0bbaa01 --- /dev/null +++ b/pkgs/development/python-modules/ocifs/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, fsspec +, oci +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ocifs"; + version = "1.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "oracle"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-4Yf6f89btzLij0OxGYRrnRpYCs8edDcwJPFbPZUfx9w="; + }; + + propagatedBuildInputs = [ + fsspec + oci + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "ocifs" + ]; + + meta = with lib; { + description = "Oracle Cloud Infrastructure Object Storage fsspec implementation"; + homepage = "https://ocifs.readthedocs.io"; + license = with licenses; [ upl ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 51cbc01b565a..d8358eae74a6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6166,6 +6166,8 @@ in { oci = callPackage ../development/python-modules/oci { }; + ocifs = callPackage ../development/python-modules/ocifs { }; + ocrmypdf = callPackage ../development/python-modules/ocrmypdf { }; od = callPackage ../development/python-modules/od { }; From 2affd4e8519e73bcc690cecaa65abb8739f82715 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 13 Aug 2022 22:08:43 +0200 Subject: [PATCH 14/49] oci-cli: 3.7.2 -> 3.14.0 --- pkgs/tools/admin/oci-cli/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/admin/oci-cli/default.nix b/pkgs/tools/admin/oci-cli/default.nix index 2272a7efdfbe..16d7a4ce9cb1 100644 --- a/pkgs/tools/admin/oci-cli/default.nix +++ b/pkgs/tools/admin/oci-cli/default.nix @@ -22,6 +22,7 @@ let inherit version; sha256 = "b85d0567b8666149a93172712e68920734333c0ce7e89b78b3e987f71e5ed4f9"; }; + doCheck = false; }); }; @@ -31,24 +32,24 @@ with py.pkgs; buildPythonApplication rec { pname = "oci-cli"; - version = "3.7.2"; + version = "3.14.0"; format = "setuptools"; src = fetchFromGitHub { owner = "oracle"; - repo = "oci-cli"; + repo = pname; rev = "v${version}"; - hash = "sha256-20Tnn0s+sfLEsAG9S6f61OVGpRf53wFPtt4a2/TJbCg="; + hash = "sha256-yooEZuSIw2EMJVyT/Z/x4hJi8a1F674CtsMMGkMAYLg="; }; propagatedBuildInputs = [ arrow certifi click - configparser cryptography jmespath oci + prompt-toolkit pyopenssl python-dateutil pytz @@ -60,9 +61,10 @@ buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ - --replace "cryptography>=3.2.1,<=3.4.7" "cryptography" \ - --replace "pyOpenSSL==19.1.0" "pyOpenSSL" \ + --replace "cryptography>=3.2.1,<=37.0.2" "cryptography" \ + --replace "pyOpenSSL>=17.5.0,<=22.0.0" "pyOpenSSL" \ --replace "PyYAML>=5.4,<6" "PyYAML" \ + --replace "prompt-toolkit==3.0.29" "prompt-toolkit" \ --replace "terminaltables==3.1.0" "terminaltables" ''; From 4b05b28a81805cbb4fd3bab6ce6322041c3f240c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 20:49:36 +0000 Subject: [PATCH 15/49] rabbitmq-server: 3.10.6 -> 3.10.7 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index f6f1afa836a6..fe030db1b31d 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.10.6"; + version = "3.10.7"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-oELL1E+VbZiWUL+l0mLg6ugvJ/RJ84O/aduDzDJyQeo="; + sha256 = "sha256-tV4wWEGH8ZZQUFPbH+kGAerHyQY0Ff/4DbBsJH1pLrU="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync python3 ]; From c3edf8a264e47d33529eea499425bbf17ab00aca Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 13 Aug 2022 18:05:07 -0300 Subject: [PATCH 16/49] zsh-completions: fix code style Signed-off-by: Otavio Salvador --- pkgs/shells/zsh/zsh-completions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index f75570a46b5b..d5a66e366bd3 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub}: +{ lib, stdenv, fetchFromGitHub }: stdenv.mkDerivation rec { pname = "zsh-completions"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; strictDeps = true; - installPhase= '' + installPhase = '' install -D --target-directory=$out/share/zsh/site-functions src/* ''; From c751554a16dd0bca40d46561da768c1d94830368 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Sat, 13 Aug 2022 18:06:04 -0300 Subject: [PATCH 17/49] zsh-completions: remove tmuxp completion tmuxp now installs the completion so we need to remove this to avoid a collision. Signed-off-by: Otavio Salvador --- pkgs/shells/zsh/zsh-completions/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/shells/zsh/zsh-completions/default.nix b/pkgs/shells/zsh/zsh-completions/default.nix index d5a66e366bd3..a108473d373c 100644 --- a/pkgs/shells/zsh/zsh-completions/default.nix +++ b/pkgs/shells/zsh/zsh-completions/default.nix @@ -14,6 +14,9 @@ stdenv.mkDerivation rec { strictDeps = true; installPhase = '' install -D --target-directory=$out/share/zsh/site-functions src/* + + # tmuxp install it so avoid collision + rm $out/share/zsh/site-functions/_tmuxp ''; meta = { From 431d982fa91ef6865fbe3c2fb999efc4aabf0c7e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 13 Aug 2022 22:12:21 +0000 Subject: [PATCH 18/49] glib-networking: 2.72.1 -> 2.72.2 --- pkgs/development/libraries/glib-networking/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index edd54516853f..489e92648a99 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "glib-networking"; - version = "2.72.1"; + version = "2.72.2"; outputs = [ "out" "installedTests" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "b8G+3IBiSE3IoCBJZZle8jZ8PbXJNAWP8WB+WiTZWnQ="; + sha256 = "zSoITHu5HXjoSftV1A5HL22PaGLN3J8Sw5FJNZuhgmg="; }; patches = [ From 203593e72ee8fa209b1a52a75764275e2801b944 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 05:08:25 +0000 Subject: [PATCH 19/49] pipenv: 2022.7.24 -> 2022.8.14 --- pkgs/development/tools/pipenv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/pipenv/default.nix b/pkgs/development/tools/pipenv/default.nix index 77089d133afa..ba2264098539 100644 --- a/pkgs/development/tools/pipenv/default.nix +++ b/pkgs/development/tools/pipenv/default.nix @@ -19,11 +19,11 @@ let in buildPythonApplication rec { pname = "pipenv"; - version = "2022.7.24"; + version = "2022.8.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-N05jRQIg16uymMuu4GxLAidObxyyznt7Z3/V/T3TCEE="; + sha256 = "sha256-Ig8YY+49Z/4HPX0U3606DNna/hvOTHlw2mrRZGfRLwY="; }; LC_ALL = "en_US.UTF-8"; From dabb2eb9ad962d9e25f900809411e6ab33fe4684 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 10:50:15 +0000 Subject: [PATCH 20/49] grafana_reporter: 2.1.0 -> 2.3.1 --- pkgs/servers/monitoring/grafana-reporter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/grafana-reporter/default.nix b/pkgs/servers/monitoring/grafana-reporter/default.nix index da60be64603e..60cf6d51224c 100644 --- a/pkgs/servers/monitoring/grafana-reporter/default.nix +++ b/pkgs/servers/monitoring/grafana-reporter/default.nix @@ -4,7 +4,7 @@ with lib; buildGoPackage rec { pname = "reporter"; - version = "2.1.0"; + version = "2.3.1"; rev = "v${version}"; goPackagePath = "github.com/IzakMarais/reporter"; @@ -15,7 +15,7 @@ buildGoPackage rec { inherit rev; owner = "IzakMarais"; repo = "reporter"; - sha256 = "1zindyypf634l4dd2rsvp67ryz9mmzq779x9d01apd04wivd9yf1"; + sha256 = "sha256-lsraJwx56I2Gn8CePWUlQu1qdMp78P4xwPzLxetYUcw="; }; postInstall = '' From 908976024d009f3bf5976342d02f04680c64ad00 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sun, 14 Aug 2022 12:56:24 +0200 Subject: [PATCH 21/49] trilium-{desktop,server}: 0.53.2 -> 0.54.2 --- pkgs/applications/office/trilium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/trilium/default.nix b/pkgs/applications/office/trilium/default.nix index 0f7b4e95ff84..46bd79eab822 100644 --- a/pkgs/applications/office/trilium/default.nix +++ b/pkgs/applications/office/trilium/default.nix @@ -10,13 +10,13 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.53.2"; + version = "0.54.2"; desktopSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - desktopSource.sha256 = "0sjljyn7x0kv1692wccdjsll8h49r9lyqbrfnz4cn147xinclyw4"; + desktopSource.sha256 = "15wbag2hk5pa6ds56ikxn9rj405jgbg6w1y896vl60sa02lm20df"; serverSource.url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - serverSource.sha256 = "0y5xjf4r0c2hw2ch4ml55fq1nlmgnakq4zh3ch8sdgzm86nchavb"; + serverSource.sha256 = "03z7z0jr1s132f10lagj786fr198l2xvpr72x2325brqlny5fzng"; in { From 3dde706c46b9813b449716c45848158b66b1c41b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 11:31:03 +0000 Subject: [PATCH 22/49] intel-compute-runtime: 22.17.23034 -> 22.31.23852 --- pkgs/os-specific/linux/intel-compute-runtime/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/intel-compute-runtime/default.nix b/pkgs/os-specific/linux/intel-compute-runtime/default.nix index 5c3154bf39df..0001493d3b39 100644 --- a/pkgs/os-specific/linux/intel-compute-runtime/default.nix +++ b/pkgs/os-specific/linux/intel-compute-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "intel-compute-runtime"; - version = "22.17.23034"; + version = "22.31.23852"; src = fetchFromGitHub { owner = "intel"; repo = "compute-runtime"; rev = version; - sha256 = "sha256-ae6kPiVQe3+hcqXVu2ncCaVQAoMKoDHifrkKpt6uWX8="; + sha256 = "sha256-YkuYW/RRRs3EYMcx2BOsEpyW3O3XzDltmIaBoqnZfhw="; }; nativeBuildInputs = [ cmake pkg-config ]; From 593d64f975e4e7d9439562d3f857d85e8be66012 Mon Sep 17 00:00:00 2001 From: "M. Ian Graham" Date: Sun, 14 Aug 2022 08:37:29 +0900 Subject: [PATCH 23/49] obs-studio: Fix wrapOBS double-including the built-in plugins --- maintainers/maintainer-list.nix | 9 +++++++++ pkgs/applications/video/obs-studio/default.nix | 2 +- pkgs/applications/video/obs-studio/wrapper.nix | 16 +++++++++++++--- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0955354fa910..844266283f2c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8481,6 +8481,15 @@ githubId = 9980864; name = "Max Hofer"; }; + miangraham = { + email = "miangraham@users.noreply.github.com"; + github = "miangraham"; + githubId = 704580; + name = "M. Ian Graham"; + keys = [{ + fingerprint = "8CE3 2906 516F C4D8 D373 308A E189 648A 55F5 9A9F"; + }]; + }; mic92 = { email = "joerg@thalheim.io"; matrix = "@mic92:nixos.dev"; diff --git a/pkgs/applications/video/obs-studio/default.nix b/pkgs/applications/video/obs-studio/default.nix index 83514923331a..044967b2e526 100644 --- a/pkgs/applications/video/obs-studio/default.nix +++ b/pkgs/applications/video/obs-studio/default.nix @@ -140,7 +140,7 @@ mkDerivation rec { video content, efficiently ''; homepage = "https://obsproject.com"; - maintainers = with maintainers; [ jb55 MP2E V ]; + maintainers = with maintainers; [ jb55 MP2E V miangraham ]; license = licenses.gpl2Plus; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; mainProgram = "obs"; diff --git a/pkgs/applications/video/obs-studio/wrapper.nix b/pkgs/applications/video/obs-studio/wrapper.nix index 80880d9318d9..3b98385a869e 100644 --- a/pkgs/applications/video/obs-studio/wrapper.nix +++ b/pkgs/applications/video/obs-studio/wrapper.nix @@ -6,7 +6,7 @@ symlinkJoin { name = "wrapped-${obs-studio.name}"; nativeBuildInputs = [ makeWrapper ]; - paths = [ obs-studio ] ++ plugins; + paths = [ obs-studio ]; postBuild = with lib; let @@ -14,11 +14,21 @@ symlinkJoin { pluginArguments = lists.concatMap (plugin: plugin.obsWrapperArguments or []) plugins; + pluginsJoined = symlinkJoin { + name = "obs-studio-plugins"; + paths = lists.map (plugin: "${plugin}/lib/obs-plugins") plugins; + }; + + pluginsDataJoined = symlinkJoin { + name = "obs-studio-plugins-data"; + paths = lists.map (plugin: "${plugin}/share/obs/obs-plugins") plugins; + }; + wrapCommand = [ "wrapProgram" "$out/bin/obs" - ''--set OBS_PLUGINS_PATH "$out/lib/obs-plugins"'' - ''--set OBS_PLUGINS_DATA_PATH "$out/share/obs/obs-plugins"'' + ''--set OBS_PLUGINS_PATH "${pluginsJoined}"'' + ''--set OBS_PLUGINS_DATA_PATH "${pluginsDataJoined}"'' ] ++ pluginArguments; in concatStringsSep " " wrapCommand; From 16835711af55c4175948f5654c02cb098e534f17 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 11:10:46 +0200 Subject: [PATCH 24/49] python310Packages.bluetooth-data-tools: init at 0.1.2 --- .../bluetooth-data-tools/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/bluetooth-data-tools/default.nix diff --git a/pkgs/development/python-modules/bluetooth-data-tools/default.nix b/pkgs/development/python-modules/bluetooth-data-tools/default.nix new file mode 100644 index 000000000000..8744adc57555 --- /dev/null +++ b/pkgs/development/python-modules/bluetooth-data-tools/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "bluetooth-data-tools"; + version = "0.1.2"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "Bluetooth-Devices"; + repo = pname; + rev = "v${version}"; + hash = "sha256-AobkHODtWun2TPxb6yR/ieYyeIndTG0KmxTY81fQHCA="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=bluetooth_data_tools --cov-report=term-missing:skip-covered" "" + ''; + + pythonImportsCheck = [ + "bluetooth_data_tools" + ]; + + meta = with lib; { + description = "Library for converting bluetooth data and packets"; + homepage = "https://github.com/Bluetooth-Devices/bluetooth-data-tools"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9e7c6ef23b2f..ae07fde44a98 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1383,6 +1383,8 @@ in { bluetooth-adapters = callPackage ../development/python-modules/bluetooth-adapters { }; + bluetooth-data-tools= callPackage ../development/python-modules/bluetooth-data-tools { }; + bluetooth-sensor-state-data = callPackage ../development/python-modules/bluetooth-sensor-state-data { }; blurhash = callPackage ../development/python-modules/blurhash { }; From 4761f05e7b1ca94eae696c6dcae177eae24d4718 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Aug 2022 16:32:38 +0000 Subject: [PATCH 25/49] python310Packages.jarowinkler: 1.2.0 -> 1.2.1 https://github.com/maxbachmann/JaroWinkler/releases/tag/v1.2.1 --- pkgs/development/python-modules/jarowinkler/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jarowinkler/default.nix b/pkgs/development/python-modules/jarowinkler/default.nix index c29a5c303c97..a8e194f1ddd7 100644 --- a/pkgs/development/python-modules/jarowinkler/default.nix +++ b/pkgs/development/python-modules/jarowinkler/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jarowinkler"; - version = "1.2.0"; + version = "1.2.1"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "JaroWinkler"; rev = "refs/tags/v${version}"; - hash = "sha256-JR6nCLO6oUxpGKjnrrVAOLbrIALSNKkll53+3p4bb1g="; + hash = "sha256-h9sR8j5avUhY+qpzKZ54O67uTjkk2JuOvMBVaohvbUk="; }; nativeBuildInputs = [ From f2969007eeead45e7bb1f1e9a51a68826344bd75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 14 Aug 2022 16:33:15 +0000 Subject: [PATCH 26/49] python310Packages.rapidfuzz: 2.4.3 -> 2.5.0 https://github.com/maxbachmann/RapidFuzz/releases/tag/v2.5.0 --- pkgs/development/python-modules/rapidfuzz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix index e981ea48524c..3b584a04b9b2 100644 --- a/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/pkgs/development/python-modules/rapidfuzz/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "2.4.3"; + version = "2.5.0"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "maxbachmann"; repo = "RapidFuzz"; rev = "refs/tags/v${version}"; - hash = "sha256-KKRqSMU1AzXYDB50CBQ1ZcL87KgG2/tL+cmR1jnrTVk="; + hash = "sha256-Cdzf6qQZQzH+tRyLEYvi7c01L5i+6WmgHozLhFQNsiQ="; }; nativeBuildInputs = [ From 3caeee2ec32cd07ccf754900b6c84a222ec2dca0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 17:06:48 +0000 Subject: [PATCH 27/49] pyinfra: 2.3 -> 2.4 --- pkgs/development/python-modules/pyinfra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinfra/default.nix b/pkgs/development/python-modules/pyinfra/default.nix index 632bb090f3f5..467bc00ba7ad 100644 --- a/pkgs/development/python-modules/pyinfra/default.nix +++ b/pkgs/development/python-modules/pyinfra/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "pyinfra"; - version = "2.3"; + version = "2.4"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "Fizzadar"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-aKEbmvxsWOJU4DWkEWxezVqXwaUofMzEphB/Hj1XqHU="; + hash = "sha256-nWH4o6NqyqkZg/HxF6NesnA6ijWo+B94BeohSsP60TY="; }; propagatedBuildInputs = [ From f8bfefdb2f5a9778ac7706427fd299d80f4a80a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Aug 2022 17:17:34 +0000 Subject: [PATCH 28/49] python310Packages.azure-keyvault-secrets: 4.4.0 -> 4.5.1 --- .../python-modules/azure-keyvault-secrets/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix index 1323fdb94db4..66c1ded269da 100644 --- a/pkgs/development/python-modules/azure-keyvault-secrets/default.nix +++ b/pkgs/development/python-modules/azure-keyvault-secrets/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "azure-keyvault-secrets"; - version = "4.4.0"; + version = "4.5.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; extension = "zip"; - hash = "sha256-wLcy253oVdnDl2YGfPQ+L2bNuyi4WfA8eH4zkkzKgtc="; + hash = "sha256-IfzSrUti4E4QZzE8dAqHnIRf4CllWzinZF2MI5XQOrI="; }; propagatedBuildInputs = [ From 0f16ca6e7947a71dc0db53e95102e1bf124ad0f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Aug 2022 18:44:54 +0000 Subject: [PATCH 29/49] rofi-unwrapped: 1.7.3 -> 1.7.4 --- pkgs/applications/misc/rofi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofi/default.nix b/pkgs/applications/misc/rofi/default.nix index 03df09319a6f..13a1f15d63c6 100644 --- a/pkgs/applications/misc/rofi/default.nix +++ b/pkgs/applications/misc/rofi/default.nix @@ -25,14 +25,14 @@ stdenv.mkDerivation rec { pname = "rofi-unwrapped"; - version = "1.7.3"; + version = "1.7.4"; src = fetchFromGitHub { owner = "davatorium"; repo = "rofi"; rev = version; fetchSubmodules = true; - sha256 = "sha256-bUedRRmrfdmzNW+2PzJvLbCTIWta2rbQ3CTLRSdJqbs="; + sha256 = "sha256-xAGhwzm+L8/aBJ65zfbnHyZFlg5x0b2s1x1aTC2I5po="; }; preConfigure = '' From 1b88241f7ee3e189642a9eee25cf9eb9f85b7ad2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 10:59:58 +0200 Subject: [PATCH 30/49] python310Packages.sensor-state-data: 2.1.2 -> 2.2.0 --- pkgs/development/python-modules/sensor-state-data/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sensor-state-data/default.nix b/pkgs/development/python-modules/sensor-state-data/default.nix index ab451315c532..a3abd9f4037b 100644 --- a/pkgs/development/python-modules/sensor-state-data/default.nix +++ b/pkgs/development/python-modules/sensor-state-data/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "sensor-state-data"; - version = "2.1.2"; + version = "2.2.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-Z4sHrj0APoCfPhdSKB9guRrPo4TD47+GcQ0KoFgb268="; + hash = "sha256-ThROGmCNsOOJ65sOXRS1FefwN8Wf2DmHP294y3JVQvk="; }; nativeBuildInputs = [ From dd70ae4c78d16dd6d1174ad12688d6704a148adb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 21:50:41 +0200 Subject: [PATCH 31/49] metasploit: 6.2.11 -> 6.2.12 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 14 ++++++------- pkgs/tools/security/metasploit/default.nix | 4 ++-- pkgs/tools/security/metasploit/gemset.nix | 22 ++++++++++----------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 176a9c231b9f..4d3d7f1d04d4 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.11" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.2.12" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index eb7bd292a0f6..64aeff5b112f 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: addeeea49e5217ade1407a2e9a3cf6514ad8972e - ref: refs/tags/6.2.11 + revision: 38794f11b8a4c685c1f90b832a9a77974f5e0471 + ref: refs/tags/6.2.12 specs: - metasploit-framework (6.2.11) + metasploit-framework (6.2.12) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -130,13 +130,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.616.0) + aws-partitions (1.618.0) aws-sdk-core (3.132.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1, >= 1.6.1) - aws-sdk-ec2 (1.326.0) + aws-sdk-ec2 (1.327.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.69.0) @@ -178,7 +178,7 @@ GEM eventmachine (1.2.7) faker (2.22.0) i18n (>= 1.8.11, < 2) - faraday (2.5.1) + faraday (2.5.2) faraday-net_http (>= 2.0, < 3.1) ruby2_keywords (>= 0.0.4) faraday-net_http (3.0.0) @@ -402,7 +402,7 @@ GEM ttfunk (1.7.0) tzinfo (2.0.5) concurrent-ruby (~> 1.0) - tzinfo-data (1.2022.1) + tzinfo-data (1.2022.2) tzinfo (>= 1.0.0) unf (0.1.4) unf_ext diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 9cbe1ff2ff3b..8c2f6ef311d7 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.2.11"; + version = "6.2.12"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-MdSAJc0H+UU5pr6OzUNOaZDE3d0MdRQyZS2Ear2Wv9k="; + sha256 = "sha256-KIpPThnT0hMeJu75yvv1YIXxb2B5SJhS2SibMAn+EU8="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 078640cb9e38..bdd22a1fdfa2 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bz5wb377xnp4hs13sf4sxalfn2ycxfry1g5lfwixzvwhhbim5x1"; + sha256 = "1wv819cag3bhq07d4xjspinakqdfw97chpd9s6qqr70xicpl43zn"; type = "gem"; }; - version = "1.616.0"; + version = "1.618.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0674pphc7m3di01dzbcvl9g5brv1mmcmj14lwaj73gsvbc6zybhy"; + sha256 = "0gdqf0dfkqk4q6x9rz9dq0sliqmybdfkbfzyifm4y2pvqaiybgir"; type = "gem"; }; - version = "1.326.0"; + version = "1.327.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -354,10 +354,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jf9gfr2viracxm0nzd2mzs07j2ilznj7w3awyrr2wm53b56pc3h"; + sha256 = "1a6q8k82vfqyzlnrs6r6d82fyz5fminc8p57mr5xkdabs0m2y3mx"; type = "gem"; }; - version = "2.5.1"; + version = "2.5.2"; }; faraday-net_http = { groups = ["default"]; @@ -614,12 +614,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "addeeea49e5217ade1407a2e9a3cf6514ad8972e"; - sha256 = "1ndzjsynm11dclr18x8cvpfw94399r1wv3mylqwlby87rljq1m1i"; + rev = "38794f11b8a4c685c1f90b832a9a77974f5e0471"; + sha256 = "0kqizq4k16r8v599hj3rc1pz31b0ypxwmygf4qg17lnk3574z2i8"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.2.11"; + version = "6.2.12"; }; metasploit-model = { groups = ["default"]; @@ -1447,10 +1447,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yvfyxz70r45j65763fzy0p5j8cxlhnpn1n5lcxj4is7hp8v5i23"; + sha256 = "0792pfxr0n143r424ibl4ahpd5yl9yxnnwifiy8qdc14j2c7bsz8"; type = "gem"; }; - version = "1.2022.1"; + version = "1.2022.2"; }; unf = { groups = ["default"]; From 9afb8af2525f395faa73f3402516831f03011db8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 14 Aug 2022 21:59:57 +0200 Subject: [PATCH 32/49] python3Packages.cattrs: fix build by upstreamed patch --- pkgs/development/python-modules/cattrs/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/cattrs/default.nix b/pkgs/development/python-modules/cattrs/default.nix index a6355e198849..6584f5f15df1 100644 --- a/pkgs/development/python-modules/cattrs/default.nix +++ b/pkgs/development/python-modules/cattrs/default.nix @@ -2,6 +2,7 @@ , attrs , buildPythonPackage , fetchFromGitHub +, fetchpatch , exceptiongroup , hypothesis , immutables @@ -32,6 +33,14 @@ buildPythonPackage rec { hash = "sha256-C8uIsewpgJfB1yYckWTwF5K32+2AAOrxFKB9I18RENg="; }; + patches = [ + (fetchpatch { + url = "https://github.com/python-attrs/cattrs/commit/290d162a589acf10ea63b825b7b283e23ca7698a.diff"; + excludes = [ "poetry.lock" ]; + hash = "sha256-n6c3qVg9umGKAxeTALq3QTJgO9DIj3SY0ZHhtsDeW94="; + }) + ]; + nativeBuildInputs = [ poetry-core ]; From 39590e137dd7aaf6a2040e26ce193ee35ebaed74 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:33:55 +0200 Subject: [PATCH 33/49] dnsrecon: 1.1.2 -> 1.1.3 --- pkgs/tools/security/dnsrecon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/dnsrecon/default.nix b/pkgs/tools/security/dnsrecon/default.nix index 3b9fa39c604d..8eb823c7f0f7 100644 --- a/pkgs/tools/security/dnsrecon/default.nix +++ b/pkgs/tools/security/dnsrecon/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "dnsrecon"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = "darkoperator"; repo = pname; rev = version; - hash = "sha256-rOFDoQEIlwV02c2aJsovnhvaC2XTFq9mMEfilG+Gs4w="; + hash = "sha256-V4/6VUlMizy8EN8ajN56YF+COn3/dfmD0997R+iR86g="; }; propagatedBuildInputs = with python3.pkgs; [ From f4786a9e3d17647b96d572356c816ca88d1c4f29 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:39:27 +0200 Subject: [PATCH 34/49] python310Packages.aiohomekit: 1.2.9 -> 1.2.10 --- pkgs/development/python-modules/aiohomekit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohomekit/default.nix b/pkgs/development/python-modules/aiohomekit/default.nix index 604d1f37e2d3..473e87e0cf79 100644 --- a/pkgs/development/python-modules/aiohomekit/default.nix +++ b/pkgs/development/python-modules/aiohomekit/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "aiohomekit"; - version = "1.2.9"; + version = "1.2.10"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "Jc2k"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-9ejha07hYwB/BZ7hmJHhmLb313ZrTvEXBylswJMlBmU="; + hash = "sha256-JJaBspM1s8n+eZfRQQfX8EY2uBWdy23403AmCXbZ1Uw="; }; nativeBuildInputs = [ From f9e632925e7d19dbfd72f4af4afaaa0f914fbe1c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:46:28 +0200 Subject: [PATCH 35/49] python310Packages.peaqevcore: 4.0.8 -> 5.1.3 --- pkgs/development/python-modules/peaqevcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix index 89e708727311..0ef9df55cf46 100644 --- a/pkgs/development/python-modules/peaqevcore/default.nix +++ b/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "4.0.8"; + version = "5.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-B0t9kNl55VsPC8ZXP7/lRDJ0Hfm4uhSEMGX9To4fjAU="; + hash = "sha256-9cfxLbpA2WHsolF/jxrsx7mEWj6exlCNHce3waI308I="; }; postPatch = '' From 9fc4eb44b178c5d027eb854215adb4dcef17feb7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:48:20 +0200 Subject: [PATCH 36/49] python310Packages.plugwise: 0.21.2 -> 0.21.3 --- pkgs/development/python-modules/plugwise/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/plugwise/default.nix b/pkgs/development/python-modules/plugwise/default.nix index 9e2a3a642a63..e09182db18c8 100644 --- a/pkgs/development/python-modules/plugwise/default.nix +++ b/pkgs/development/python-modules/plugwise/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "plugwise"; - version = "0.21.2"; + version = "0.21.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = pname; repo = "python-plugwise"; rev = "refs/tags/v${version}"; - sha256 = "sha256-vWPKlI1dRj2bN36SnkkjibACPkCqjlQn2Dq9+usgOhc="; + sha256 = "sha256-z/HSvk8fXPZmmx7lWaUMPfgT8EAmRn5sjRI+F4JKryw="; }; propagatedBuildInputs = [ From 07e72bf7f9e9d6a3636f3bd1da783fd8c0624db1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:50:37 +0200 Subject: [PATCH 37/49] python310Packages.pymicrobot: 0.0.1 -> 0.0.3 --- pkgs/development/python-modules/pymicrobot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymicrobot/default.nix b/pkgs/development/python-modules/pymicrobot/default.nix index 00bdd859405f..e6ca92f0e2e4 100644 --- a/pkgs/development/python-modules/pymicrobot/default.nix +++ b/pkgs/development/python-modules/pymicrobot/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pymicrobot"; - version = "0.0.1"; + version = "0.0.3"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "PyMicroBot"; inherit version; - hash = "sha256-I43a75jEU/jvjAEUBXeTZGGBy0pne1P3DA9Gbzy+c34="; + hash = "sha256-lXBL1G/rZrQah/zcVH1dFyKXO5jGB9XhmXmiKKIAbT4="; }; propagatedBuildInputs = [ From d91372dedbb85d56d06050ba1f194300b44ffe23 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 22:55:28 +0200 Subject: [PATCH 38/49] python310Packages.pynetgear: 0.10.6 -> 0.10.7 --- pkgs/development/python-modules/pynetgear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynetgear/default.nix b/pkgs/development/python-modules/pynetgear/default.nix index 9c1a17e340a0..09b3426f6d9a 100644 --- a/pkgs/development/python-modules/pynetgear/default.nix +++ b/pkgs/development/python-modules/pynetgear/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pynetgear"; - version = "0.10.6"; + version = "0.10.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "MatMaul"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-lpCBwz7B6QHLmFQwOz+QA3oJ2GOrE1Y/qjWE328vD2A="; + sha256 = "sha256-dYpYUeZClfRGrhd5Rw7MzBQkyGURQTeQVtCc51AqXb4="; }; propagatedBuildInputs = [ From dbd18a63a7e8bb59efa9e556241786ac2169033a Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 4 Aug 2022 15:26:03 -0400 Subject: [PATCH 39/49] fetchgit: allow disabling cone mode for sparse checkouts, fix test --- doc/builders/fetchers.chapter.md | 6 +++--- .../manual/from_md/release-notes/rl-2211.section.xml | 12 ++++++++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ pkgs/build-support/fetchgit/builder.sh | 1 + pkgs/build-support/fetchgit/default.nix | 4 +++- pkgs/build-support/fetchgit/nix-prefetch-git | 4 +++- pkgs/build-support/fetchgit/tests.nix | 12 ++++++++++++ 7 files changed, 36 insertions(+), 5 deletions(-) diff --git a/doc/builders/fetchers.chapter.md b/doc/builders/fetchers.chapter.md index 947afe8e9fdb..12d8a5d887fd 100644 --- a/doc/builders/fetchers.chapter.md +++ b/doc/builders/fetchers.chapter.md @@ -91,7 +91,7 @@ Used with Git. Expects `url` to a Git repo, `rev`, and `sha256`. `rev` in this c Additionally, the following optional arguments can be given: `fetchSubmodules = true` makes `fetchgit` also fetch the submodules of a repository. If `deepClone` is set to true, the entire repository is cloned as opposing to just creating a shallow clone. `deepClone = true` also implies `leaveDotGit = true` which means that the `.git` directory of the clone won't be removed after checkout. -If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) and [git clone --filter](https://git-scm.com/docs/git-clone#Documentation/git-clone.txt---filterltfilter-specgt) for more information: +If only parts of the repository are needed, `sparseCheckout` can be used. This will prevent git from fetching unnecessary blobs from server, see [git sparse-checkout](https://git-scm.com/docs/git-sparse-checkout) for more information: ```nix { stdenv, fetchgit }: @@ -101,8 +101,8 @@ stdenv.mkDerivation { src = fetchgit { url = "https://..."; sparseCheckout = '' - path/to/be/included - another/path + directory/to/be/included + another/directory ''; sha256 = "0000000000000000000000000000000000000000000000000000"; }; diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 383c9d8a04cd..b5c3df14e45a 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -251,6 +251,18 @@ (with foo; isPower && is32bit && isBigEndian). + + + The fetchgit fetcher now uses + cone + mode by default for sparse checkouts. + Non-cone + mode can be enabled by passing + nonConeMode = true, but note that non-cone + mode is deprecated and this option may be removed alongside a + future Git update without notice. + + bsp-layout no longer uses the command diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 53daf9544634..1e37922f7b23 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -97,6 +97,8 @@ In addition to numerous new and upgraded packages, this release has the followin - The `isPowerPC` predicate, found on `platform` attrsets (`hostPlatform`, `buildPlatform`, `targetPlatform`, etc) has been removed in order to reduce confusion. The predicate was was defined such that it matches only the 32-bit big-endian members of the POWER/PowerPC family, despite having a name which would imply a broader set of systems. If you were using this predicate, you can replace `foo.isPowerPC` with `(with foo; isPower && is32bit && isBigEndian)`. +- The `fetchgit` fetcher now uses [cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalscone_mode_handling) by default for sparse checkouts. [Non-cone mode](https://www.git-scm.com/docs/git-sparse-checkout/2.37.0#_internalsnon_cone_problems) can be enabled by passing `nonConeMode = true`, but note that non-cone mode is deprecated and this option may be removed alongside a future Git update without notice. + - `bsp-layout` no longer uses the command `cycle` to switch to other window layouts, as it got replaced by the commands `previous` and `next`. - The Barco ClickShare driver/client package `pkgs.clickshare-csc1` and the option `programs.clickshare-csc1.enable` have been removed, diff --git a/pkgs/build-support/fetchgit/builder.sh b/pkgs/build-support/fetchgit/builder.sh index c7c7d21709a1..66b6c168e41d 100644 --- a/pkgs/build-support/fetchgit/builder.sh +++ b/pkgs/build-support/fetchgit/builder.sh @@ -12,6 +12,7 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \ ${deepClone:+--deepClone} \ ${fetchSubmodules:+--fetch-submodules} \ ${sparseCheckout:+--sparse-checkout "$sparseCheckout"} \ + ${nonConeMode:+--non-cone-mode} \ ${branchName:+--branch-name "$branchName"} runHook postFetch diff --git a/pkgs/build-support/fetchgit/default.nix b/pkgs/build-support/fetchgit/default.nix index 84f2278db299..f516c3d5a03b 100644 --- a/pkgs/build-support/fetchgit/default.nix +++ b/pkgs/build-support/fetchgit/default.nix @@ -16,6 +16,7 @@ in , fetchSubmodules ? true, deepClone ? false , branchName ? null , sparseCheckout ? "" +, nonConeMode ? false , name ? urlToName url rev , # Shell code executed after the file has been fetched # successfully. This can do things like check or transform the file. @@ -54,6 +55,7 @@ in */ assert deepClone -> leaveDotGit; +assert nonConeMode -> (sparseCheckout != ""); if md5 != "" then throw "fetchgit does not support md5 anymore, please use sha256" @@ -77,7 +79,7 @@ stdenvNoCC.mkDerivation { else lib.fakeSha256; - inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout postFetch; + inherit url rev leaveDotGit fetchLFS fetchSubmodules deepClone branchName sparseCheckout nonConeMode postFetch; postHook = if netrcPhase == null then null else '' ${netrcPhase} diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 4e6f25b8dd7d..9c2048066ce4 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -49,6 +49,7 @@ Options: --hash h Expected hash. --branch-name Branch name to check out into --sparse-checkout Only fetch and checkout part of the repository. + --non-cone-mode Use non-cone mode for sparse checkouts. --deepClone Clone the entire repository. --no-deepClone Make a shallow clone of just the required ref. --leave-dotGit Keep the .git directories. @@ -77,6 +78,7 @@ for arg; do --branch-name) argfun=set_branchName;; --deepClone) deepClone=true;; --sparse-checkout) argfun=set_sparseCheckout;; + --non-cone-mode) nonConeMode=true;; --quiet) QUIET=true;; --no-deepClone) deepClone=;; --leave-dotGit) leaveDotGit=true;; @@ -116,7 +118,7 @@ init_remote(){ clean_git remote add origin "$url" if [ -n "$sparseCheckout" ]; then git config remote.origin.partialclonefilter "blob:none" - echo "$sparseCheckout" | git sparse-checkout set --stdin + echo "$sparseCheckout" | git sparse-checkout set --stdin ${nonConeMode:+--no-cone} fi ( [ -n "$http_proxy" ] && clean_git config http.proxy "$http_proxy" ) || true } diff --git a/pkgs/build-support/fetchgit/tests.nix b/pkgs/build-support/fetchgit/tests.nix index b9ab66d9353c..62fe3f77bbdd 100644 --- a/pkgs/build-support/fetchgit/tests.nix +++ b/pkgs/build-support/fetchgit/tests.nix @@ -16,6 +16,18 @@ src tests ''; + sha256 = "sha256-g1PHGTWgAcd/+sXHo1o6AjVWCvC6HiocOfMbMh873LQ="; + }; + + sparseCheckoutNonConeMode = testers.invalidateFetcherByDrvHash fetchgit { + name = "nix-source"; + url = "https://github.com/NixOS/nix"; + rev = "9d9dbe6ed05854e03811c361a3380e09183f4f4a"; + sparseCheckout = '' + src + tests + ''; + nonConeMode = true; sha256 = "sha256-FknO6C/PSnMPfhUqObD4vsW4PhkwdmPa9blNzcNvJQ4="; }; } From 419dda4c60d96e118ba8187eedc119ae48990c36 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 4 Aug 2022 15:26:32 -0400 Subject: [PATCH 40/49] git: add fetchgit tests to passthru.tests --- .../version-management/git-and-tools/git/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 9e735edea8af..9cab44840d4a 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -20,6 +20,7 @@ , gzip # needed at runtime by gitweb.cgi , withSsh ? false , doInstallCheck ? !stdenv.isDarwin # extremely slow on darwin +, tests }: assert osxkeychainSupport -> stdenv.isDarwin; @@ -374,6 +375,7 @@ stdenv.mkDerivation (finalAttrs: { doInstallCheck = true; }); buildbot-integration = nixosTests.buildbot; + inherit (tests) fetchgit; }; }; From 38858263dae5850f39a4de7b3ece4a82ef549283 Mon Sep 17 00:00:00 2001 From: Winter Date: Thu, 4 Aug 2022 15:27:17 -0400 Subject: [PATCH 41/49] treewide: fix hashes for sparse checkout --- .../misc/nerd-font-patcher/default.nix | 2 +- pkgs/data/fonts/noto-fonts/default.nix | 4 ++-- .../icons/beauty-line-icon-theme/default.nix | 2 +- pkgs/games/itch/default.nix | 17 ++++++++--------- 4 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/nerd-font-patcher/default.nix b/pkgs/applications/misc/nerd-font-patcher/default.nix index ac3fa9200a70..9912c3231c7e 100644 --- a/pkgs/applications/misc/nerd-font-patcher/default.nix +++ b/pkgs/applications/misc/nerd-font-patcher/default.nix @@ -13,7 +13,7 @@ python3Packages.buildPythonApplication rec { font-patcher /src/glyphs ''; - sha256 = "sha256-ePBlEVjzAJ7g6iAGIqPfgZ8bwtNILmyEVm0zD+xNN6k="; + sha256 = "sha256-06dn6M2wCFO/uBHDR7VZHNHIybT4h/VGD9nHc4G0EKA="; }; propagatedBuildInputs = with python3Packages; [ fontforge ]; diff --git a/pkgs/data/fonts/noto-fonts/default.nix b/pkgs/data/fonts/noto-fonts/default.nix index 4d91bf8905d5..45366a8e5054 100644 --- a/pkgs/data/fonts/noto-fonts/default.nix +++ b/pkgs/data/fonts/noto-fonts/default.nix @@ -117,14 +117,14 @@ in typeface = "Sans"; version = "2.004"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-11d/78i21yuzxrfB5t2VQN9OBz/qZKeozuS6BrLFjzw="; + sha256 = "sha256-PWpcTBnBRK87ZuRI/PsGp2UMQgCCyfkLHwvB1mOl5K0="; }; noto-fonts-cjk-serif = mkNotoCJK { typeface = "Serif"; version = "2.000"; rev = "9f7f3c38eab63e1d1fddd8d50937fe4f1eacdb1d"; - sha256 = "sha256-G+yl3LZvSFpbEUuuvattPDctKTzBCshOi970DcbPliE="; + sha256 = "sha256-1w66Ge7DZjbONGhxSz69uFhfsjMsDiDkrGl6NsoB7dY="; }; noto-fonts-emoji = let diff --git a/pkgs/data/icons/beauty-line-icon-theme/default.nix b/pkgs/data/icons/beauty-line-icon-theme/default.nix index 66e5ac57dd17..275f5e0dc03b 100644 --- a/pkgs/data/icons/beauty-line-icon-theme/default.nix +++ b/pkgs/data/icons/beauty-line-icon-theme/default.nix @@ -21,7 +21,7 @@ stdenvNoCC.mkDerivation rec { sparseCheckout = '' BeautyLine-V3 ''; - sha256 = "sha256-IkkypAj250+OXbf19TampCnqYsSbJVIjeYlxJoyhpzk="; + sha256 = "sha256-VEQWMY77cVz6UDn7FeMYYyYgXmXl1lLYs8MlFUuGRZE="; }; sourceRoot = "${src.name}/BeautyLine-V3"; diff --git a/pkgs/games/itch/default.nix b/pkgs/games/itch/default.nix index 991623b6c9f7..6f6dbde15d63 100644 --- a/pkgs/games/itch/default.nix +++ b/pkgs/games/itch/default.nix @@ -35,14 +35,13 @@ stdenvNoCC.mkDerivation rec { sha256 = "sha256-5MP6X33Jfu97o5R1n6Og64Bv4ZMxVM0A8lXeQug+bNA="; }; - icons = let sparseCheckout = "/release/images/itch-icons"; in - fetchFromGitHub { - owner = "itchio"; - repo = pname; - rev = "v${version}"; - hash = "sha256-1L6STTBHA9xL9IaERaH2OTvurTSng1D+P3KoW0ucEJc="; - inherit sparseCheckout; - } + sparseCheckout; + icons = fetchFromGitHub { + owner = "itchio"; + repo = pname; + rev = "v${version}"; + hash = "sha256-DZBmf8fe0zw5uiQjNKXw8g/vU2hjNDa87z/7XuhyXog="; + sparseCheckout = "release/images/itch-icons"; + }; nativeBuildInputs = [ copyDesktopItems makeWrapper ]; @@ -69,7 +68,7 @@ stdenvNoCC.mkDerivation rec { install -Dm644 LICENSE -t "$out/share/licenses/$pkgname/" install -Dm644 LICENSES.chromium.html -t "$out/share/licenses/$pkgname/" - for icon in $icons/icon*.png + for icon in $icons/release/images/itch-icons/icon*.png do iconsize="''${icon#$icons/icon}" iconsize="''${iconsize%.png}" From e8453ebbac980ac95d9ec5ab3bd6d7c69cb4eabc Mon Sep 17 00:00:00 2001 From: n-cc Date: Sun, 14 Aug 2022 16:03:55 -0500 Subject: [PATCH 42/49] mpv: add libXpresent dependency --- pkgs/applications/video/mpv/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 3ceda57fb899..cf81c0e0446c 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -32,6 +32,7 @@ , libXext , libXxf86vm , libXrandr + , libXpresent , cddaSupport ? false , libcdio @@ -160,7 +161,7 @@ in stdenv.mkDerivation rec { ++ lib.optionals vdpauSupport [ libvdpau ] ++ lib.optionals vulkanSupport [ libplacebo shaderc vulkan-headers vulkan-loader ] ++ lib.optionals waylandSupport [ wayland wayland-protocols libxkbcommon ] - ++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr ] + ++ lib.optionals x11Support [ libX11 libXext libGLU libGL libXxf86vm libXrandr libXpresent ] ++ lib.optionals xineramaSupport [ libXinerama ] ++ lib.optionals xvSupport [ libXv ] ++ lib.optionals zimgSupport [ zimg ] From b2e48228f94f62c026d859cbfa42882467891ebe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 23:05:32 +0200 Subject: [PATCH 43/49] python310Packages.twilio: 7.12.0 -> 7.12.1 --- pkgs/development/python-modules/twilio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 8c0a1f7fc2f2..078f6dbde76b 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.12.0"; + version = "7.12.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-/ni7QwBJTLc9hZPFg6wPskwuqmyKS4MHr+r7d/i87Mc="; + hash = "sha256-gM4P65YMT61kCkvUJPc0fvs+CNYGdgD1dkJ8h3qYzWs="; }; propagatedBuildInputs = [ From 599776d5e627734c03e302e4aafc25bec0b7c668 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 23:09:23 +0200 Subject: [PATCH 44/49] python310Packages.xknx: 0.22.1 -> 1.0.0 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 8a9ec6f0c56b..c15ac82fc1ac 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.22.1"; + version = "1.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-CQX6dd/taVyqLKMzhFJxmYjbpZQIHYD+Nps1WyGqqnw="; + sha256 = "sha256-gJw/PtPwXo1FJcEH8SYRyQNaJoWQIfH2Mnxu52CqI8s="; }; propagatedBuildInputs = [ From 6e99500faa4419247a9c14148408b56c67d99c61 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 23:11:26 +0200 Subject: [PATCH 45/49] python310Packages.teslajsonpy: 2.4.0 -> 2.4.1 --- pkgs/development/python-modules/teslajsonpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/teslajsonpy/default.nix b/pkgs/development/python-modules/teslajsonpy/default.nix index ebc0f4e6ecd1..2c0c38daccb0 100644 --- a/pkgs/development/python-modules/teslajsonpy/default.nix +++ b/pkgs/development/python-modules/teslajsonpy/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "teslajsonpy"; - version = "2.4.0"; + version = "2.4.1"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "zabuldon"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-BAayVUmp2dsaWzH8dvTjZCKGnpc6uY6Y/6gWYIgaES8="; + sha256 = "sha256-YkutsaxPxspIclRlcr5dzk7JKvlX6IXbccca3NLFtSo="; }; nativeBuildInputs = [ From 104dd5ae9c4bcbbdc12b47f2acf6e792b0038c4e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 14 Aug 2022 23:41:12 +0200 Subject: [PATCH 46/49] python310Packages.dicttoxml2: 2.0.0 -> 2.1.0 --- pkgs/development/python-modules/dicttoxml2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dicttoxml2/default.nix b/pkgs/development/python-modules/dicttoxml2/default.nix index 5f407d61b67b..873063498535 100644 --- a/pkgs/development/python-modules/dicttoxml2/default.nix +++ b/pkgs/development/python-modules/dicttoxml2/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "dicttoxml2"; - version = "2.0.0"; + version = "2.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-8/Zbv8WxDP5Bn4hgd7hTstmYv7amTlTxhQoKvzYrG/I="; + hash = "sha256-Z8tynzN911KAjAIbcMjfijT4S54RGl26o34ADur01GI="; }; # Module has no tests From 48f5dbcd38a22e71400278a9108cad1db3c016dd Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Mon, 15 Aug 2022 08:33:00 +1000 Subject: [PATCH 47/49] yt-dlp: 2022.8.8 -> 2022.8.14 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.08.14 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index eef90d17d67c..2da719887583 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,11 +20,11 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.8.8"; + version = "2022.8.14"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Fcq2Em4SrxETQhOAbmpc+X0cYiHhSKomGN3UKTmjCo0="; + sha256 = "sha256-mizrdqTMSKqAEn7/ioU9nIt+/ovhIcISPcv9PQa8lF8="; }; propagatedBuildInputs = [ brotli certifi mutagen pycryptodomex websockets ]; From 17cfbb2e32ad13e9bcfd08b50e32a1b34d3f76c2 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 15 Aug 2022 00:38:50 +0200 Subject: [PATCH 48/49] python3Packages.s3fs: unbreak on aarch64-linux --- pkgs/development/python-modules/s3fs/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/s3fs/default.nix b/pkgs/development/python-modules/s3fs/default.nix index 18332b234154..bb4d5828284f 100644 --- a/pkgs/development/python-modules/s3fs/default.nix +++ b/pkgs/development/python-modules/s3fs/default.nix @@ -41,7 +41,7 @@ buildPythonPackage rec { ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; + broken = stdenv.isDarwin; homepage = "https://github.com/dask/s3fs/"; description = "A Pythonic file interface for S3"; license = licenses.bsd3; From 19f152c2b0318e9cb2232d43d25d44b9eb3f5110 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20K=C3=B6gler?= Date: Sun, 14 Aug 2022 21:01:39 +0200 Subject: [PATCH 49/49] neovide: 0.9.0 -> 0.10.0 --- .../editors/neovim/neovide/Cargo.lock.patch | 13 +++++++++++++ .../editors/neovim/neovide/default.nix | 14 +++++++++----- .../editors/neovim/neovide/skia-externals.json | 8 ++++---- 3 files changed, 26 insertions(+), 9 deletions(-) create mode 100644 pkgs/applications/editors/neovim/neovide/Cargo.lock.patch diff --git a/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch b/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch new file mode 100644 index 000000000000..ebf56a64e4a1 --- /dev/null +++ b/pkgs/applications/editors/neovim/neovide/Cargo.lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index f86b4b4..befc2bf 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -1326,7 +1326,7 @@ checksum = "e1bcdd74c20ad5d95aacd60ef9ba40fdf77f767051040541df557b7a9b2a2121" + + [[package]] + name = "neovide" +-version = "0.9.0" ++version = "0.10.0" + dependencies = [ + "async-trait", + "cfg-if 1.0.0", diff --git a/pkgs/applications/editors/neovim/neovide/default.nix b/pkgs/applications/editors/neovim/neovide/default.nix index 346647838e95..f74fcc937c1f 100644 --- a/pkgs/applications/editors/neovim/neovide/default.nix +++ b/pkgs/applications/editors/neovim/neovide/default.nix @@ -25,16 +25,20 @@ }: rustPlatform.buildRustPackage rec { pname = "neovide"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromGitHub { owner = "Kethku"; repo = "neovide"; rev = version; - sha256 = "sha256-2fN05o8Zo1MGdIYUcsCgkiW/kG6DkY8uTnpw2XrKxrI="; + sha256 = "sha256-4oZJZd5Allh9Wc7YOvW9sF+38Sm15dL03TJZkHTbXXc="; + postFetch = '' + cd $out + patch -p1 -i ${./Cargo.lock.patch} + ''; }; - cargoSha256 = "sha256-eATUyczkcwHI8Y7Gl2ts4dRgiFUAL8yrWDNe4JzserE="; + cargoSha256 = "sha256-E1Wp5tPVK+5WIQ+3OrzY3W9Vfy57DHgNccKtIp/vUy8="; SKIA_SOURCE_DIR = let @@ -42,8 +46,8 @@ rustPlatform.buildRustPackage rec { owner = "rust-skia"; repo = "skia"; # see rust-skia:skia-bindings/Cargo.toml#package.metadata skia - rev = "m100-0.48.7"; - sha256 = "sha256-roZUv5YoLolRi0iWAB+5WlCFV+8GdzNzS+JINnEHaMs="; + rev = "m103-0.51.1"; + sha256 = "sha256-w5dw/lGm40gKkHPR1ji/L82Oa808Kuh8qaCeiqBLkLw="; }; # The externals for skia are taken from skia/DEPS externals = lib.mapAttrs (n: fetchgit) (lib.importJSON ./skia-externals.json); diff --git a/pkgs/applications/editors/neovim/neovide/skia-externals.json b/pkgs/applications/editors/neovim/neovide/skia-externals.json index fe0bcdea9378..e7ee3fc53a53 100644 --- a/pkgs/applications/editors/neovim/neovide/skia-externals.json +++ b/pkgs/applications/editors/neovim/neovide/skia-externals.json @@ -6,8 +6,8 @@ }, "libjpeg-turbo": { "url": "https://chromium.googlesource.com/chromium/deps/libjpeg_turbo.git", - "rev": "02959c3ee17abacfd1339ec22ea93301292ffd56", - "sha256": "sha256-cuSBVhHCX2Fh2SmmRpjinYtge8yaxcM06jlSXfvCywk=" + "rev": "22f1a22c99e9dde8cd3c72ead333f425c5a7aa77", + "sha256": "sha256-5MaYvyrhADFGKBxcS3kbKcn9tj0FNXAN/rAXXYW6ljs=" }, "icu": { "url": "https://chromium.googlesource.com/chromium/deps/icu.git", @@ -21,8 +21,8 @@ }, "harfbuzz": { "url": "https://chromium.googlesource.com/external/github.com/harfbuzz/harfbuzz.git", - "rev": "a8b7f1880412c7f0c9ecdada0a4935011816c7dc", - "sha256": "sha256-QyVkeBVl45gygOylhnojcQuDIBp2DT2d7pD+OcX29VU=" + "rev": "8d1b000a3edc90c12267b836b4ef3f81c0e53edc", + "sha256": "sha256-nFAT7HnYkIWZcV6kjDQiRltbPcmbtuRM4m5ecY4/s6E=" }, "libpng": { "url": "https://skia.googlesource.com/third_party/libpng.git",