From 2f8266e02234a6a2e2ce2b939366e63b5369c278 Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 3 Jan 2023 08:13:03 -0500 Subject: [PATCH 001/174] sonic-pi: add updateScript --- pkgs/applications/audio/sonic-pi/default.nix | 2 + pkgs/applications/audio/sonic-pi/update.sh | 50 ++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100755 pkgs/applications/audio/sonic-pi/update.sh diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 1f5bb36a5144..85e9d514a51b 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -216,6 +216,8 @@ stdenv.mkDerivation rec { }) ]; + passthru.updateScript = ./update.sh; + meta = with lib; { homepage = "https://sonic-pi.net/"; description = "Free live coding synth for everyone originally designed to support computing and music lessons within schools"; diff --git a/pkgs/applications/audio/sonic-pi/update.sh b/pkgs/applications/audio/sonic-pi/update.sh new file mode 100755 index 000000000000..014af49e73a8 --- /dev/null +++ b/pkgs/applications/audio/sonic-pi/update.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p nix jq common-updater-scripts + +set -euo pipefail + +nixpkgs="$(git rev-parse --show-toplevel || (printf 'Could not find root of nixpkgs repo\nAre we running from within the nixpkgs git repo?\n' >&2; exit 1))" + +stripwhitespace() { + sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//' +} + +nixeval() { + nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1" | jq -r . +} + +vendorhash() { + (nix --extra-experimental-features nix-command build --impure --argstr nixpkgs "$nixpkgs" --argstr attr "$1" --expr '{ nixpkgs, attr }: let pkgs = import nixpkgs {}; in with pkgs.lib; (getAttrFromPath (splitString "." attr) pkgs).overrideAttrs (attrs: { outputHash = fakeHash; })' --no-link 2>&1 >/dev/null | tail -n3 | grep -F got: | cut -d: -f2- | stripwhitespace) 2>/dev/null || true +} + +findpath() { + path="$(nix --extra-experimental-features nix-command eval --json --impure -f "$nixpkgs" "$1.meta.position" | jq -r . | cut -d: -f1)" + outpath="$(nix --extra-experimental-features nix-command eval --json --impure --expr "builtins.fetchGit \"$nixpkgs\"")" + + if [ -n "$outpath" ]; then + path="${path/$(echo "$outpath" | jq -r .)/$nixpkgs}" + fi + + echo "$path" +} + +attr="${UPDATE_NIX_ATTR_PATH:-sonic-pi}" +version="$(cd "$nixpkgs" && list-git-tags --pname="$(nixeval "$attr".pname)" --attr-path="$attr" | grep '^v' | sed -e 's|^v||' | sort -V | tail -n1)" + +pkgpath="$(findpath "$attr")" + +updated="$(cd "$nixpkgs" && update-source-version "$attr" "$version" --file="$pkgpath" --print-changes | jq -r length)" + +if [ "$updated" -eq 0 ]; then + echo 'update.sh: Package version not updated, nothing to do.' + exit 0 +fi + +curhash="$(nixeval "$attr.mixFodDeps.outputHash")" +newhash="$(vendorhash "$attr.mixFodDeps")" + +if [ -n "$newhash" ] && [ "$curhash" != "$newhash" ]; then + sed -i -e "s|\"$curhash\"|\"$newhash\"|" "$pkgpath" +else + echo 'update.sh: New vendorHash same as old vendorHash, nothing to do.' +fi From 5988ada8358cb66b5486889db22aba37caaf4f4c Mon Sep 17 00:00:00 2001 From: Lily Foster Date: Tue, 3 Jan 2023 08:08:40 -0500 Subject: [PATCH 002/174] sonic-pi: add ruby to nativeBuildInputs The ruby interpreter is used during the configure and build phases in addition to the check phase, so add it to nativeBuildInputs instead of checkInputs. --- pkgs/applications/audio/sonic-pi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/sonic-pi/default.nix b/pkgs/applications/audio/sonic-pi/default.nix index 85e9d514a51b..dc8ce444482b 100644 --- a/pkgs/applications/audio/sonic-pi/default.nix +++ b/pkgs/applications/audio/sonic-pi/default.nix @@ -63,6 +63,7 @@ stdenv.mkDerivation rec { copyDesktopItems cmake pkg-config + ruby erlang elixir beamPackages.hex @@ -94,7 +95,6 @@ stdenv.mkDerivation rec { checkInputs = [ parallel - ruby supercollider-with-sc3-plugins jack2 ]; From 6f63865cf470ce99b36bceacbefbb6886d05be51 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 3 Feb 2023 17:49:39 -0600 Subject: [PATCH 003/174] dockerTools: Add minimal test case for #214434 --- nixos/tests/docker-tools.nix | 51 +++++++++++++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 1 deletion(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 98704ecb2fb6..58d1d45f2fad 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -1,6 +1,49 @@ # this test creates a simple GNU image with docker tools and sees if it executes -import ./make-test-python.nix ({ pkgs, ... }: { +import ./make-test-python.nix ({ pkgs, ... }: +let + # nixpkgs#214434: dockerTools.buildImage fails to unpack base images + # containing duplicate rootfs diffs when those duplicate tarballs + # appear under the manifest's 'Layers'. Docker can generate images + # like this even though dockerTools does not. + repeatedLayerTestImage = + let + # Rootfs diffs for layers 1 and 2 are identical (and empty) + layer1 = pkgs.dockerTools.buildImage { name = "empty"; }; + layer2 = layer1.overrideAttrs (_: { fromImage = layer1; }); + repeatedRootfsDiffs = pkgs.runCommandNoCC "image-with-links.tar" { + nativeBuildInputs = [pkgs.jq]; + } '' + mkdir contents + tar -xf "${layer2}" -C contents + cd contents + first_rootfs=$(jq -r '.[0].Layers[0]' manifest.json) + second_rootfs=$(jq -r '.[0].Layers[1]' manifest.json) + target_rootfs=$(sha256sum "$first_rootfs" | cut -d' ' -f 1).tar + + # Replace duplicated rootfs diffs with symlinks to one tarball + chmod -R ug+w . + mv "$first_rootfs" "$target_rootfs" + rm "$second_rootfs" + ln -s "../$target_rootfs" "$first_rootfs" + ln -s "../$target_rootfs" "$second_rootfs" + + # Update manifest's layers to use the symlinks' target + cat manifest.json | \ + jq ".[0].Layers[0] = \"$target_rootfs\"" | + jq ".[0].Layers[1] = \"$target_rootfs\"" > manifest.json.new + mv manifest.json.new manifest.json + + tar --sort=name --hard-dereference -cf $out . + ''; + in pkgs.dockerTools.buildImage { + fromImage = repeatedRootfsDiffs; + name = "repeated-layer-test"; + copyToRoot = pkgs.bash; + # A runAsRoot script is required to force previous layers to be unpacked + runAsRoot = ""; + }; +in { name = "docker-tools"; meta = with pkgs.lib.maintainers; { maintainers = [ lnl7 roberth ]; @@ -221,6 +264,12 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker run --rm ${examples.layersUnpackOrder.imageName} cat /layer-order" ) + with subtest("Ensure repeated base layers handled by buildImage"): + docker.succeed( + "docker load --input='${repeatedLayerTestImage}'", + "docker run --rm ${repeatedLayerTestImage.imageName} /bin/bash -c 'exit 0'" + ) + with subtest("Ensure environment variables are correctly inherited"): docker.succeed( "docker load --input='${examples.environmentVariables}'" From f4e4cac0c86f0e16aac773083aebbfc0e7daea43 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Fri, 3 Feb 2023 17:50:36 -0600 Subject: [PATCH 004/174] dockerTools: Correctly unpack duplicate rootfs diffs This PR addresses issue #214434 by preventing dockerTools.buildImage from deleting rootfs diffs until after they've been unpacked. --- pkgs/build-support/docker/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index bdc93f3643f1..0e4011a532b3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -259,13 +259,14 @@ rec { mkdir -p image/$extractionID/layer tar -C image/$extractionID/layer -xpf image/$layerTar - rm image/$layerTar find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; # Get the next lower directory and continue the loop. lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir done + # Don't remove tarballs until all unpacked in case some are used more than once + awk '{print "image/"$0}' layer-list | xargs rm -f mkdir work mkdir layer From eb38ad04efae0ebcd7217c4ccace3da0102d85af Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Mon, 6 Feb 2023 11:05:13 -0600 Subject: [PATCH 005/174] dockerTools: ensure runAsRoot script not optimized away in test Co-authored-by: Robert Hensing --- nixos/tests/docker-tools.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 58d1d45f2fad..09741858c82e 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -41,7 +41,9 @@ let name = "repeated-layer-test"; copyToRoot = pkgs.bash; # A runAsRoot script is required to force previous layers to be unpacked - runAsRoot = ""; + runAsRoot = '' + echo 'runAsRoot has run.' + ''; }; in { name = "docker-tools"; From c66cabe33ea1f969ef9562feeef0a015b83a60b1 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Mon, 6 Feb 2023 11:15:33 -0600 Subject: [PATCH 006/174] dockerTools: use more familiar terminology to describe test image Co-authored-by: Robert Hensing --- nixos/tests/docker-tools.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 09741858c82e..06100f9d7842 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }: let # nixpkgs#214434: dockerTools.buildImage fails to unpack base images - # containing duplicate rootfs diffs when those duplicate tarballs + # containing duplicate layers when those duplicate tarballs # appear under the manifest's 'Layers'. Docker can generate images # like this even though dockerTools does not. repeatedLayerTestImage = From 298c543e55284a3be8e8785302883fb873e005af Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Mon, 6 Feb 2023 12:18:23 -0600 Subject: [PATCH 007/174] dockerTools: Specify 'latest' tag for repeated layer test image --- nixos/tests/docker-tools.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/tests/docker-tools.nix b/nixos/tests/docker-tools.nix index 06100f9d7842..44b583ebcea5 100644 --- a/nixos/tests/docker-tools.nix +++ b/nixos/tests/docker-tools.nix @@ -39,6 +39,7 @@ let in pkgs.dockerTools.buildImage { fromImage = repeatedRootfsDiffs; name = "repeated-layer-test"; + tag = "latest"; copyToRoot = pkgs.bash; # A runAsRoot script is required to force previous layers to be unpacked runAsRoot = '' From 84e04ccf8570e9f8072486f7d750d326225c7117 Mon Sep 17 00:00:00 2001 From: Andrew Brooks Date: Mon, 6 Feb 2023 12:19:29 -0600 Subject: [PATCH 008/174] dockerTools: Preprocess layers list before unpack to handle repeated layers --- pkgs/build-support/docker/default.nix | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 0e4011a532b3..7fa5aeafc8e3 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -229,6 +229,15 @@ rec { mount /dev/${vmTools.hd} disk cd disk + function dedup() { + declare -A seen + while read ln; do + if [[ -z "''${seen["$ln"]:-}" ]]; then + echo "$ln"; seen["$ln"]=1 + fi + done + } + if [[ -n "$fromImage" ]]; then echo "Unpacking base image..." mkdir image @@ -245,7 +254,8 @@ rec { parentID="$(cat "image/manifest.json" | jq -r '.[0].Config | rtrimstr(".json")')" fi - cat ./image/manifest.json | jq -r '.[0].Layers | .[]' > layer-list + # In case of repeated layers, unpack only the last occurrence of each + cat ./image/manifest.json | jq -r '.[0].Layers | .[]' | tac | dedup | tac > layer-list else touch layer-list fi @@ -259,14 +269,13 @@ rec { mkdir -p image/$extractionID/layer tar -C image/$extractionID/layer -xpf image/$layerTar + rm image/$layerTar find image/$extractionID/layer -name ".wh.*" -exec bash -c 'name="$(basename {}|sed "s/^.wh.//")"; mknod "$(dirname {})/$name" c 0 0; rm {}' \; # Get the next lower directory and continue the loop. lowerdir=image/$extractionID/layer''${lowerdir:+:}$lowerdir done - # Don't remove tarballs until all unpacked in case some are used more than once - awk '{print "image/"$0}' layer-list | xargs rm -f mkdir work mkdir layer From c7fbd40fd152506057d84e3e656dd564164168d2 Mon Sep 17 00:00:00 2001 From: Alexis Hildebrandt Date: Tue, 7 Feb 2023 11:27:11 +0100 Subject: [PATCH 009/174] groff: Add enableIconv and enableLibuchardet option --- pkgs/tools/text/groff/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index a38251557c09..9a6c5fcc5660 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,6 +1,8 @@ { lib, stdenv, fetchurl, fetchpatch, perl , enableGhostscript ? false, ghostscript # for postscript and html output , enableHtml ? false, psutils, netpbm # for html output +, enableIconv ? false, iconv +, enableLibuchardet ? false, libuchardet # for detecting input file encoding in preconv(1) , buildPackages , autoreconfHook , pkg-config @@ -54,7 +56,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkg-config texinfo ]; buildInputs = [ perl bash ] ++ lib.optionals enableGhostscript [ ghostscript ] - ++ lib.optionals enableHtml [ psutils netpbm ]; + ++ lib.optionals enableHtml [ psutils netpbm ] + ++ lib.optionals enableIconv [ iconv ] + ++ lib.optionals enableLibuchardet [ libuchardet ]; # Builds running without a chroot environment may detect the presence # of /usr/X11 in the host system, leading to an impure build of the From 235d9e218736a7d930992e7297bef1182d69fd60 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Thu, 9 Feb 2023 13:54:06 +0100 Subject: [PATCH 010/174] lib/licenses.nix: Add cc-by-nc-nd-30 --- lib/licenses.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 0c4d9d8bc9e1..601ea5866cfe 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -220,6 +220,12 @@ in mkLicense lset) ({ fullName = "Creative Commons Zero v1.0 Universal"; }; + cc-by-nc-nd-30 = { + spdxId = "CC-BY-NC-ND-3.0"; + fullName = "Creative Commons Attribution Non Commercial No Derivative Works 3.0 Unported"; + free = false; + }; + cc-by-nc-sa-20 = { spdxId = "CC-BY-NC-SA-2.0"; fullName = "Creative Commons Attribution Non Commercial Share Alike 2.0"; From 0061f844c9bbc993606eecd79243a07fb358443e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 20 Feb 2023 23:42:02 +0000 Subject: [PATCH 011/174] onlyoffice-documentserver: 7.3.0 -> 7.3.2 --- pkgs/servers/onlyoffice-documentserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/onlyoffice-documentserver/default.nix b/pkgs/servers/onlyoffice-documentserver/default.nix index 517d288b8f7b..c79548a0e9f9 100644 --- a/pkgs/servers/onlyoffice-documentserver/default.nix +++ b/pkgs/servers/onlyoffice-documentserver/default.nix @@ -15,11 +15,11 @@ let # var/www/onlyoffice/documentserver/server/DocService/docservice onlyoffice-documentserver = stdenv.mkDerivation rec { pname = "onlyoffice-documentserver"; - version = "7.3.0"; + version = "7.3.2"; src = fetchurl { url = "https://github.com/ONLYOFFICE/DocumentServer/releases/download/v${lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version))}/onlyoffice-documentserver_amd64.deb"; - sha256 = "sha256-PBea6VYJkjBf19AQ702OtLsHJ230Sc3e3K9HAccL0BM="; + sha256 = "sha256-BXKf5M10/ICxSDXJDmJB+T3HSsVXzSs5gu1AApUra3I="; }; preferLocalBuild = true; From fef1cfb05a1fa5596591058fe56fbb120b83d550 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 22 Feb 2023 13:20:22 +0100 Subject: [PATCH 012/174] python3Packages.grpcio: Fix build parallelism --- pkgs/development/python-modules/grpcio/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/grpcio/default.nix b/pkgs/development/python-modules/grpcio/default.nix index 486742ccb605..a8dade04a36f 100644 --- a/pkgs/development/python-modules/grpcio/default.nix +++ b/pkgs/development/python-modules/grpcio/default.nix @@ -26,7 +26,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ six protobuf ] ++ lib.optionals (isPy27) [ enum34 futures ]; - preBuild = lib.optionalString stdenv.isDarwin "unset AR"; + preBuild = '' + export GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS="$NIX_BUILD_CORES" + if [ -z "$enableParallelBuilding" ]; then + GRPC_PYTHON_BUILD_EXT_COMPILER_JOBS=1 + fi + '' + lib.optionalString stdenv.isDarwin '' + unset AR + ''; GRPC_BUILD_WITH_BORING_SSL_ASM = ""; GRPC_PYTHON_BUILD_SYSTEM_OPENSSL = 1; @@ -36,6 +43,8 @@ buildPythonPackage rec { # does not contain any tests doCheck = false; + enableParallelBuilding = true; + pythonImportsCheck = [ "grpc" ]; meta = with lib; { From c4fc77a0c987f48f4927bbbbd295ed3ecafd94c0 Mon Sep 17 00:00:00 2001 From: Arjan Schrijver Date: Wed, 8 Feb 2023 17:13:10 +0100 Subject: [PATCH 013/174] python3Packages.qtile-extras: init at 0.22.1 --- .../python-modules/qtile-extras/default.nix | 84 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 86 insertions(+) create mode 100644 pkgs/development/python-modules/qtile-extras/default.nix diff --git a/pkgs/development/python-modules/qtile-extras/default.nix b/pkgs/development/python-modules/qtile-extras/default.nix new file mode 100644 index 000000000000..76962bb49671 --- /dev/null +++ b/pkgs/development/python-modules/qtile-extras/default.nix @@ -0,0 +1,84 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, setuptools-scm +, pytestCheckHook +, xorgserver +, pulseaudio +, pytest-asyncio +, qtile +, keyring +, requests +, stravalib +}: + +buildPythonPackage rec { + pname = "qtile-extras"; + version = "0.22.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "elParaguayo"; + repo = pname; + rev = "v${version}"; + hash = "sha256-2dMpGLtwIp7+aoOgYav2SAjaKMiXHmmvsWTBEIMKEW4="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ setuptools-scm ]; + + nativeCheckInputs = [ + pytestCheckHook + xorgserver + ]; + checkInputs = [ + pytest-asyncio + qtile.unwrapped + pulseaudio + keyring + requests + stravalib + ]; + disabledTests = [ + # AttributeError: 'ImgMask' object has no attribute '_default_size'. Did you mean: 'default_size'? + # cairocffi.pixbuf.ImageLoadingError: Pixbuf error: Unrecognized image file format + "test_draw" + "test_icons" + "1-x11-GithubNotifications-kwargs3" + "1-x11-SnapCast-kwargs8" + "1-x11-TVHWidget-kwargs10" + "test_tvh_widget_not_recording" + "test_tvh_widget_recording" + "test_tvh_widget_popup" + "test_snapcast_options" + # ValueError: Namespace Gdk not available + # AssertionError: Window never appeared... + "test_gloabl_menu" + "test_statusnotifier_menu" + # AttributeError: 'str' object has no attribute 'canonical' + "test_strava_widget_display" + "test_strava_widget_popup" + # Needs a running DBUS + "test_brightness_power_saving" + "test_upower_all_batteries" + "test_upower_named_battery" + "test_upower_low_battery" + "test_upower_critical_battery" + "test_upower_charging" + "test_upower_show_text" + ]; + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ "qtile_extras" ]; + + meta = with lib; { + description = "Extra modules and widgets for the Qtile tiling window manager"; + homepage = "https://github.com/elParaguayo/qtile-extras"; + changelog = "https://github.com/elParaguayo/qtile-extras/blob/${src.rev}/CHANGELOG"; + license = licenses.mit; + maintainers = with maintainers; [ arjan-s ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c41bf30acb8c..6ef2aafb11db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9806,6 +9806,8 @@ self: super: with self; { qtconsole = callPackage ../development/python-modules/qtconsole { }; + qtile-extras = callPackage ../development/python-modules/qtile-extras { }; + qtpy = callPackage ../development/python-modules/qtpy { }; quadprog = callPackage ../development/python-modules/quadprog { }; From 476b6f8d6c69084280fa691fdd7b12109fe0534d Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Mon, 27 Feb 2023 11:26:46 -0500 Subject: [PATCH 014/174] python310Packages.deid: init at 0.3.21 --- .../python-modules/deid/default.nix | 74 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 76 insertions(+) create mode 100644 pkgs/development/python-modules/deid/default.nix diff --git a/pkgs/development/python-modules/deid/default.nix b/pkgs/development/python-modules/deid/default.nix new file mode 100644 index 000000000000..6c5146313881 --- /dev/null +++ b/pkgs/development/python-modules/deid/default.nix @@ -0,0 +1,74 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, pytestCheckHook +, matplotlib +, pydicom +, python-dateutil +, setuptools +}: + +let + deid-data = buildPythonPackage rec { + pname = "deid-data"; + version = "unstable-2022-12-06"; + format = "pyproject"; + disabled = pythonOlder "3.7"; + + nativeBuildInputs = [ setuptools ]; + propagatedBuildInputs = [ pydicom ]; + + src = fetchFromGitHub { + owner = "pydicom"; + repo = "deid-data"; + rev = "5750d25a5048fba429b857c16bf48b0139759644"; + hash = "sha256-c8NBAN53NyF9dPB7txqYtM0ac0Y+Ch06fMA1LrIUkbc="; + }; + + meta = { + description = "Supplementary data for deid package"; + homepage = "https://github.com/pydicom/deid-data"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.bcdarwin ]; + }; + }; +in +buildPythonPackage rec { + pname = "deid"; + version = "0.3.21"; + + format = "pyproject"; + disabled = pythonOlder "3.7"; + + # Pypi version has no tests + src = fetchFromGitHub { + owner = "pydicom"; + repo = pname; + # the github repo does not contain Pypi version tags: + rev = "38717b8cbfd69566ba489dd0c9858bb93101e26d"; + hash = "sha256-QqofxNjshbNfu8vZ37rB6pxj5R8q0wlUhJRhrpkKySk="; + }; + + propagatedBuildInputs = [ + matplotlib + pydicom + python-dateutil + ]; + + nativeCheckInputs = [ + deid-data + pytestCheckHook + ]; + + pythonImportsCheck = [ + "deid" + ]; + + meta = with lib; { + description = "Best-effort anonymization for medical images"; + homepage = "https://pydicom.github.io/deid"; + license = licenses.mit; + maintainers = with maintainers; [ bcdarwin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 08f7417ac863..7d8133b86d05 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2363,6 +2363,8 @@ self: super: with self; { defusedxml = callPackage ../development/python-modules/defusedxml { }; + deid = callPackage ../development/python-modules/deid { }; + delegator-py = callPackage ../development/python-modules/delegator-py { }; delorean = callPackage ../development/python-modules/delorean { }; From 03bd63043fe664316f479fc0a548e903432fbb0f Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 1 Mar 2023 15:54:05 +0800 Subject: [PATCH 015/174] deepin.dtkgui: don't propagate librsvg and freeimage --- pkgs/desktops/deepin/library/dtkgui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/deepin/library/dtkgui/default.nix b/pkgs/desktops/deepin/library/dtkgui/default.nix index 0cc40768285a..b408055b0c37 100644 --- a/pkgs/desktops/deepin/library/dtkgui/default.nix +++ b/pkgs/desktops/deepin/library/dtkgui/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { buildInputs = [ lxqt.libqtxdg + librsvg + freeimage ]; propagatedBuildInputs = [ dtkcore - librsvg qtimageformats - freeimage ]; cmakeFlags = [ From 735b57d962bf61f5457f48e8d8e16da56ff1d88a Mon Sep 17 00:00:00 2001 From: Zoe Roux Date: Thu, 2 Mar 2023 01:35:08 +0900 Subject: [PATCH 016/174] linuxPackages.tuxedo-keyboard: 3.1.1 -> 3.1.4 --- pkgs/os-specific/linux/tuxedo-keyboard/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix index effba31ef8fd..cf0a5a99a69c 100644 --- a/pkgs/os-specific/linux/tuxedo-keyboard/default.nix +++ b/pkgs/os-specific/linux/tuxedo-keyboard/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "tuxedo-keyboard-${kernel.version}"; - version = "3.1.1"; + version = "3.1.4"; src = fetchFromGitHub { owner = "tuxedocomputers"; repo = "tuxedo-keyboard"; rev = "v${version}"; - sha256 = "+59/5vfwx9fys7Q63SahVPS/ckvwkr4w6T37UqAnwZ4="; + sha256 = "h6+br+JPEItym83MaVt+xo6o/zMtTv8+wsBoTeYa2AM="; }; buildInputs = [ linuxHeaders ]; From 1bf8d63f8fe9b48225ed58a561b991bc4ba00398 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Fri, 3 Mar 2023 20:18:18 +1100 Subject: [PATCH 017/174] openai-full: create variant that includes optional deps --- pkgs/top-level/all-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da31cb1c716a..60ca6594a46b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18424,6 +18424,10 @@ with pkgs; openai = with python3Packages; toPythonApplication openai; + openai-full = with python3Packages; toPythonApplication (openai.override { + withOptionalDependencies = true; + }); + openai-whisper = with python3.pkgs; toPythonApplication openai-whisper; openai-whisper-cpp = callPackage ../tools/audio/openai-whisper-cpp { From 2100c4926200b1ebbee032ad22113597195932f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cyryl=20P=C5=82otnicki?= Date: Fri, 3 Mar 2023 23:22:25 +0000 Subject: [PATCH 018/174] endless-sky:0.9.14 -> 0.9.16.1 --- pkgs/games/endless-sky/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/endless-sky/default.nix b/pkgs/games/endless-sky/default.nix index 7806ae4906a2..ac44390faf56 100644 --- a/pkgs/games/endless-sky/default.nix +++ b/pkgs/games/endless-sky/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, fetchFromGitHub -, SDL2, libpng, libjpeg, glew, openal, scons, libmad +, SDL2, libpng, libjpeg, glew, openal, scons, libmad, libuuid }: stdenv.mkDerivation rec { pname = "endless-sky"; - version = "0.9.14"; + version = "0.9.16.1"; src = fetchFromGitHub { owner = "endless-sky"; repo = "endless-sky"; rev = "v${version}"; - sha256 = "sha256-Vcck+zGcv39DXyhZF2DLUrXq3gDwkgL0NtPT5rVOpHs="; + sha256 = "sha256-bohljxAtSVqsfnge6t4LF3pC1s1r99v3hNLKTBquC20="; }; patches = [ @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = [ - SDL2 libpng libjpeg glew openal scons libmad + SDL2 libpng libjpeg glew openal scons libmad libuuid ]; prefixKey = "PREFIX="; From b373d299bae89922f2bde5f351b90495b182daf2 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 3 Mar 2023 21:00:54 -0500 Subject: [PATCH 019/174] docs/rust: improve docs for nightly usage --- doc/languages-frameworks/rust.section.md | 172 ++++++++++------------- 1 file changed, 76 insertions(+), 96 deletions(-) diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index ec703105e15a..b3f4405ee935 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -13,7 +13,7 @@ into your `configuration.nix` or bring them into scope with `nix-shell -p rustc For other versions such as daily builds (beta and nightly), use either `rustup` from nixpkgs (which will manage the rust installation in your home directory), -or use a community maintained [Rust overlay](#using-community-rust-overlays). +or use [community maintained Rust toolchains](#using-community-maintained-rust-toolchains). ## `buildRustPackage`: Compiling Rust applications with Cargo {#compiling-rust-applications-with-cargo} @@ -686,31 +686,61 @@ $ cargo build $ cargo test ``` -### Controlling Rust Version Inside `nix-shell` {#controlling-rust-version-inside-nix-shell} +## Using community maintained Rust toolchains {#using-community-maintained-rust-toolchains} -To control your rust version (i.e. use nightly) from within `shell.nix` (or -other nix expressions) you can use the following `shell.nix` +::: {.note} +Note: The following projects cannot be used within nixpkgs since [IFD](#ssec-import-from-derivation) is disallowed. +To package things that require Rust nightly, `RUSTC_BOOTSTRAP = true;` can sometimes be used as a hack. +::: + +There are two community maintained approaches to Rust toolchain management: +- [oxalica's Rust overlay](https://github.com/oxalica/rust-overlay) +- [fenix](https://github.com/nix-community/fenix) + +Despite their names, both projects provides a similar set of packages and overlays under different APIs. + +Oxalica's overlay allows you to select a particular Rust version without you providing a hash or a flake input, +but comes with a larger git repository than fenix. + +Fenix also provides rust-analyzer nightly in addition to the Rust toolchains. + +Both oxalica's overlay and fenix better integrate with nix and cache optimizations. +Because of this and ergonomics, either of those community projects +should be preferred to the Mozilla's Rust overlay ([nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla)). + +The following documentation demonstrates examples using fenix and oxalica's Rust overlay +with `nix-shell` and building derivations. More advanced usages like flake usage +are documented in their own repositories. + +### Using Rust nightly with `nix-shell` {#using-rust-nightly-with-nix-shell} + +Here is a simple `shell.nix` that provides Rust nightly (default profile) using fenix: ```nix -# Latest Nightly -with import {}; -let src = fetchFromGitHub { - owner = "mozilla"; - repo = "nixpkgs-mozilla"; - # commit from: 2019-05-15 - rev = "9f35c4b09fd44a77227e79ff0c1b4b6a69dff533"; - hash = "sha256-18h0nvh55b5an4gmlgfbvwbyqj91bklf1zymis6lbdh75571qaz0="; - }; +with import { }; +let + fenix = callPackage + (fetchFromGitHub { + owner = "nix-community"; + repo = "fenix"; + # commit from: 2023-03-03 + rev = "e2ea04982b892263c4d939f1cc3bf60a9c4deaa1"; + hash = "sha256-AsOim1A8KKtMWIxG+lXh5Q4P2bhOZjoUhFWJ1EuZNNk="; + }) + { }; in -with import "${src.out}/rust-overlay.nix" pkgs pkgs; -stdenv.mkDerivation { +mkShell { name = "rust-env"; - buildInputs = [ - # Note: to use stable, just replace `nightly` with `stable` - latest.rustChannels.nightly.rust + nativeBuildInputs = [ + # Note: to use stable, just replace `default` with `stable` + fenix.default.toolchain - # Add some extra dependencies from `pkgs` - pkg-config openssl + # Example Build-time Additional Dependencies + pkg-config + ]; + buildInputs = [ + # Example Run-time Additional Dependencies + openssl ]; # Set Environment Variables @@ -718,116 +748,66 @@ stdenv.mkDerivation { } ``` -Now run: +Save this to `shell.nix`, then run: ```ShellSession $ rustc --version -rustc 1.26.0-nightly (188e693b3 2018-03-26) +rustc 1.69.0-nightly (13471d3b2 2023-03-02) ``` To see that you are using nightly. -## Using community Rust overlays {#using-community-rust-overlays} +Oxalica's Rust overlay has more complete examples of `shell.nix` (and cross compilation) under its +[`examples` directory](https://github.com/oxalica/rust-overlay/tree/e53e8853aa7b0688bc270e9e6a681d22e01cf299/examples). -There are two community maintained approaches to Rust toolchain management: -- [oxalica's Rust overlay](https://github.com/oxalica/rust-overlay) -- [fenix](https://github.com/nix-community/fenix) +### Using Rust nightly in a derivation with `buildRustPackage` {#using-rust-nightly-in-a-derivation-with-buildrustpackage} -Oxalica's overlay allows you to select a particular Rust version and components. -See [their documentation](https://github.com/oxalica/rust-overlay#rust-overlay) for more -detailed usage. +You can also use Rust nightly to build rust packages using `makeRustPlatform`. +The below snippet demonstrates invoking `buildRustPackage` with a Rust toolchain from oxalica's overlay: -Fenix is an alternative to `rustup` and can also be used as an overlay. - -Both oxalica's overlay and fenix better integrate with nix and cache optimizations. -Because of this and ergonomics, either of those community projects -should be preferred to the Mozilla's Rust overlay (`nixpkgs-mozilla`). - -### How to select a specific `rustc` and toolchain version {#how-to-select-a-specific-rustc-and-toolchain-version} - -You can consume the oxalica overlay and use it to grab a specific Rust toolchain version. -Here is an example `shell.nix` showing how to grab the current stable toolchain: ```nix -{ pkgs ? import { - overlays = [ - (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) - ]; - } -}: -pkgs.mkShell { - nativeBuildInputs = with pkgs; [ - pkg-config - rust-bin.stable.latest.minimal - ]; -} -``` - -You can try this out by: -1. Saving that to `shell.nix` -2. Executing `nix-shell --pure --command 'rustc --version'` - -As of writing, this prints out `rustc 1.56.0 (09c42c458 2021-10-18)`. - -### How to use an overlay toolchain in a derivation {#how-to-use-an-overlay-toolchain-in-a-derivation} - -You can also use an overlay's Rust toolchain with `buildRustPackage`. -The below snippet demonstrates invoking `buildRustPackage` with an oxalica overlay selected Rust toolchain: -```nix -with import { +with import +{ overlays = [ (import (fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) ]; }; +let + rustPlatform = makeRustPlatform { + cargo = rust-bin.stable.latest.minimal; + rustc = rust-bin.stable.latest.minimal; + }; +in rustPlatform.buildRustPackage rec { pname = "ripgrep"; version = "12.1.1"; - nativeBuildInputs = [ - rust-bin.stable.latest.minimal - ]; src = fetchFromGitHub { owner = "BurntSushi"; repo = "ripgrep"; rev = version; - hash = "sha256-1hqps7l5qrjh9f914r5i6kmcz6f1yb951nv4lby0cjnp5l253kps="; + hash = "sha256-+s5RBC3XSgb8omTbUNLywZnP6jSxZBKSS1BmXOjRF8M="; }; - cargoSha256 = "03wf9r2csi6jpa7v5sw5lpxkrk4wfzwmzx7k3991q3bdjzcwnnwp"; + cargoHash = "sha256-l1vL2ZdtDRxSGvP0X/l3nMw8+6WF67KPutJEzUROjg8="; + + doCheck = false; meta = with lib; { description = "A fast line-oriented regex search tool, similar to ag and ack"; homepage = "https://github.com/BurntSushi/ripgrep"; - license = licenses.unlicense; - maintainers = [ maintainers.tailhook ]; + license = with licenses; [ mit unlicense ]; + maintainers = with maintainers; [ tailhook ]; }; } ``` Follow the below steps to try that snippet. -1. create a new directory 1. save the above snippet as `default.nix` in that directory -1. cd into that directory and run `nix-build` +2. cd into that directory and run `nix-build` -### Rust overlay installation {#rust-overlay-installation} - -You can use this overlay by either changing your local nixpkgs configuration, -or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`. -For more information see [the manual on installing overlays](#sec-overlays-install). - -### Declarative Rust overlay installation {#declarative-rust-overlay-installation} - -This snippet shows how to use oxalica's Rust overlay. -Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: - -```nix -{ pkgs ? import { - overlays = [ - (import (builtins.fetchTarball "https://github.com/oxalica/rust-overlay/archive/master.tar.gz")) - # Further overlays go here - ]; - }; -}; -``` - -Note that this will fetch the latest overlay version when rebuilding your system. +Fenix also has examples with `buildRustPackage`, +[crane](https://github.com/ipetkov/crane), +[naersk](https://github.com/nix-community/naersk), +and cross compilation in its [Examples](https://github.com/nix-community/fenix#examples) section. From fcc10ee9a4891ea20194fa8178d55786439fd73a Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 3 Mar 2023 21:39:31 -0500 Subject: [PATCH 020/174] cargo-binutils: don't recommend nixpkgs-mozilla --- pkgs/development/tools/rust/cargo-binutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix index 81a973547db6..af3673e28bce 100644 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { meta = with lib; { description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; longDescription = '' - In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. nixpkgs-mozilla, or rust-overlay) + In order for this to work, you either need to run `rustup component add llvm-tools-preview` or install the `llvm-tools-preview` component using your Nix library (e.g. fenix or rust-overlay) ''; homepage = "https://github.com/rust-embedded/cargo-binutils"; changelog = "https://github.com/rust-embedded/cargo-binutils/blob/v${version}/CHANGELOG.md"; From 35081a77d56c84bea79bc810a825179357d68658 Mon Sep 17 00:00:00 2001 From: figsoda Date: Fri, 3 Mar 2023 21:40:00 -0500 Subject: [PATCH 021/174] cargo-llvm-cov: don't recommend nixpkgs-mozilla --- pkgs/development/tools/rust/cargo-llvm-cov/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix index d8b94b298b10..5fabbd96c397 100644 --- a/pkgs/development/tools/rust/cargo-llvm-cov/default.nix +++ b/pkgs/development/tools/rust/cargo-llvm-cov/default.nix @@ -36,7 +36,7 @@ rustPlatform.buildRustPackage rec { longDescription = '' In order for this to work, you either need to run `rustup component add llvm- tools-preview` or install the `llvm-tools-preview` component using your Nix - library (e.g. nixpkgs-mozilla, or rust-overlay) + library (e.g. fenix or rust-overlay) ''; license = with lib.licenses; [ asl20 /* or */ mit ]; maintainers = with lib.maintainers; [ wucke13 ]; From 48eab73bb6145dc3e78325fc1bda679ba5c8645a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 18:48:23 +0100 Subject: [PATCH 022/174] python310Packages.eradicate: update meta --- .../python-modules/eradicate/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 757dad33c096..362f94a826da 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -1,4 +1,7 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib +, buildPythonPackage +, fetchPypi +}: buildPythonPackage rec { pname = "eradicate"; @@ -6,14 +9,14 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-qsc4SrJbG/IcTAEt6bS/g5iUWhTJjJEVRbLqUKtVgBQ="; + hash = "sha256-qsc4SrJbG/IcTAEt6bS/g5iUWhTJjJEVRbLqUKtVgBQ="; }; meta = with lib; { - description = "eradicate removes commented-out code from Python files."; + description = "Library to remove commented-out code from Python files"; homepage = "https://github.com/myint/eradicate"; - license = [ licenses.mit ]; - - maintainers = [ maintainers.mmlb ]; + changelog = "https://github.com/wemake-services/eradicate/releases/tag/2.2.0"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ mmlb ]; }; } From 57e21e88b204c55eac1569807dd974741beffb5f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 18:49:51 +0100 Subject: [PATCH 023/174] python310Packages.eradicate: disable on unsupported Python releases --- pkgs/development/python-modules/eradicate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 362f94a826da..9905f9cff153 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - hash = "sha256-qsc4SrJbG/IcTAEt6bS/g5iUWhTJjJEVRbLqUKtVgBQ="; + sha256 = "sha256-qsc4SrJbG/IcTAEt6bS/g5iUWhTJjJEVRbLqUKtVgBQ="; }; meta = with lib; { description = "Library to remove commented-out code from Python files"; homepage = "https://github.com/myint/eradicate"; - changelog = "https://github.com/wemake-services/eradicate/releases/tag/2.2.0"; + changelog = "https://github.com/wemake-services/eradicate/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ mmlb ]; }; From e1806091d7374613c403414ae0debb58e6a7c814 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 Mar 2023 18:59:44 +0100 Subject: [PATCH 024/174] python310Packages.eradicate: 2.1.0 -> 2.2.0 Diff: https://github.com/wemake-services/eradicate/compare/refs/tags/2.1.0...2.2.0 Changelog: https://github.com/wemake-services/eradicate/releases/tag/2.2.0 --- .../python-modules/eradicate/default.nix | 29 +++++++++++++++---- 1 file changed, 24 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/eradicate/default.nix b/pkgs/development/python-modules/eradicate/default.nix index 9905f9cff153..8df654c0a2ed 100644 --- a/pkgs/development/python-modules/eradicate/default.nix +++ b/pkgs/development/python-modules/eradicate/default.nix @@ -1,17 +1,36 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "eradicate"; - version = "2.1.0"; + version = "2.2.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-qsc4SrJbG/IcTAEt6bS/g5iUWhTJjJEVRbLqUKtVgBQ="; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "wemake-services"; + repo = pname; + rev = "refs/tags/${version}"; + sha256 = "sha256-pVjvzW3UVeLMLLYcU0SIE19GEHFmouoA/JKSweTZSGo="; }; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "eradicate" + ]; + + pytestFlagsArray = [ + "test_eradicate.py" + ]; + meta = with lib; { description = "Library to remove commented-out code from Python files"; homepage = "https://github.com/myint/eradicate"; From 3c4b76f46e2a7301b516df31d6024782eba9ba07 Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Sun, 5 Mar 2023 18:39:19 +0100 Subject: [PATCH 025/174] katawa-shoujo: init at 1.3.1 --- pkgs/games/katawa-shoujo/default.nix | 163 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 165 insertions(+) create mode 100644 pkgs/games/katawa-shoujo/default.nix diff --git a/pkgs/games/katawa-shoujo/default.nix b/pkgs/games/katawa-shoujo/default.nix new file mode 100644 index 000000000000..aeee79c5c029 --- /dev/null +++ b/pkgs/games/katawa-shoujo/default.nix @@ -0,0 +1,163 @@ +{ stdenvNoCC +, lib +, fetchurl +, autoPatchelfHook +, freetype +, makeWrapper +, libGL +, libGLU +# Darwin cannot handle these when devendored: +# - DYLD_LIBRARY_PATH masks system libraries with similar, differently-cased names and cause missing symbol errors +# - symlinks cause unrelated BMP image loading to fail(?) +, devendorImageLibs ? !stdenvNoCC.hostPlatform.isDarwin +, libjpeg +, libpng12 +, libX11 +, libXext +, libXi +, libXmu +, runtimeShell +, SDL_compat +, SDL_image +, SDL_ttf +, undmg +, zlib +}: + +let + stdenv = stdenvNoCC; + srcDetails = rec { + x86_64-linux = { + urlSuffix = "%5blinux-x86%5d%5b18161880%5d.tar.bz2"; + hash = "sha256-7FoFz88dWYHs2/pxkEwnmiFeeb3+slayrWknEJoAB9o="; + }; + i686-linux = x86_64-linux; + x86_64-darwin = { + urlSuffix = "%5bmac%5d%5b1DFC84A6%5d.dmg"; + hash = "sha256-Sc5BAlpJsffjcNrZ8+VU3n7G10DoqDKQn/leHDW32Y8="; + }; + }.${stdenv.hostPlatform.system} or (throw "Don't know how to fetch source for ${stdenv.hostPlatform.system}!"); +in +stdenv.mkDerivation rec { + pname = "katawa-shoujo"; + version = "1.3.1"; + + src = fetchurl { + url = "https://dl.katawa-shoujo.com/gold_${version}/%5b4ls%5d_katawa_shoujo_${version}-${srcDetails.urlSuffix}"; + inherit (srcDetails) hash; + }; + + # fetchzip requires a custom unpackPhase to handle dmg, fetchurl cannot handle undmg producing >1 directory without this + sourceRoot = "."; + + nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ + autoPatchelfHook + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + makeWrapper + undmg + ]; + + buildInputs = [ + freetype + SDL_compat + zlib + ] ++ lib.optionals devendorImageLibs [ + libjpeg + libpng12 + ] ++ lib.optionals stdenv.hostPlatform.isLinux [ + libX11 + libXext + libXi + libXmu + libGL + libGLU + ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = let + platformDetails = with stdenv.hostPlatform; if isDarwin then rec { + arch = "darwin-x86_64"; + sourceDir = "'Katawa Shoujo'.app"; + installDir = "$out/Applications/'Katawa Shoujo'.app"; + dataDir = "${installDir}/Contents/Resources/autorun"; + bin = "${installDir}/Contents/MacOS/'Katawa Shoujo'"; + } else rec { + arch = "linux-${if isx86_64 then "x86_64" else "i686"}"; + sourceDir = "'Katawa Shoujo'-${version}-linux"; + installDir = "$out/share/katawa-shoujo"; + dataDir = installDir; + bin = "${installDir}/'Katawa Shoujo'.sh"; + }; + libDir = with platformDetails; "${dataDir}/lib/${arch}"; + in with platformDetails; '' + runHook preInstall + + mkdir -p "$(dirname ${installDir})" + cp -R ${sourceDir} ${installDir} + + # Simplify launcher script + cat <${bin} + #!${runtimeShell} + exec \$RENPY_GDB ${libDir}/'Katawa Shoujo' \$RENPY_PYARGS -EO ${dataDir}/'Katawa Shoujo'.py "\$@" + EOF + + '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + # No autoPatchelfHook on Darwin + wrapProgram ${bin} \ + --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} + '' + '' + + # Delete binaries for wrong arch, autoPatchelfHook gets confused by them & less to keep in the store + find "$(dirname ${libDir})" -mindepth 1 -maxdepth 1 \ + -not -name 'python*' -not -name ${arch} \ + -exec rm -r {} \; + + # Replace some bundled libs so Nixpkgs' versions are used + rm ${libDir}/libz* + rm ${libDir}/libfreetype* + rm ${libDir}/libSDL-1.2* + '' + lib.optionalString devendorImageLibs '' + rm ${libDir}/libjpeg* + rm ${libDir}/libpng12* + '' + '' + + mkdir -p $out/share/{doc,licenses}/katawa-shoujo + mv ${dataDir}/'Game Manual'.pdf $out/share/doc/katawa-shoujo/ + mv ${dataDir}/LICENSE.txt $out/share/licenses/katawa-shoujo/ + + mkdir -p $out/bin + ln -s ${bin} $out/bin/katawa-shoujo + + runHook postInstall + ''; + + meta = with lib; { + description = "Bishoujo-style visual novel by Four Leaf Studios, built in Ren'Py"; + longDescription = '' + Katawa Shoujo is a bishoujo-style visual novel set in the fictional Yamaku High School for disabled children, + located somewhere in modern Japan. Hisao Nakai, a normal boy living a normal life, has his life turned upside down + when a congenital heart defect forces him to move to a new school after a long hospitalization. Despite his difficulties, + Hisao is able to find friends—and perhaps love, if he plays his cards right. There are five main paths corresponding + to the 5 main female characters, each path following the storyline pertaining to that character. + + The story is told through the perspective of the main character, using a first person narrative. The game uses a + traditional text and sprite-based visual novel model with an ADV text box. + + Katawa Shoujo contains adult material, and was created using the Ren'Py scripting system. It is the product of an + international team of amateur developers, and is available free of charge under the Creative Commons BY-NC-ND License. + ''; + homepage = "https://www.katawa-shoujo.com/"; + # https://www.katawa-shoujo.com/about.php + # November 2022: Update, is it still ND? + # https://ks.renai.us/viewtopic.php?f=13&p=248149#p248149 + license = with licenses; [ cc-by-nc-nd-30 ]; + maintainers = with maintainers; [ OPNA2608 ]; + # Building Ren'Py6 from source would allow more, but too much of a hassle + platforms = platforms.x86; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + # Needs different srcDetails & installPhase + broken = stdenv.hostPlatform.isWindows; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e47674107bbd..4aa18716b6a6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34763,6 +34763,8 @@ with pkgs; jumpnbump = callPackage ../games/jumpnbump { }; + katawa-shoujo = callPackage ../games/katawa-shoujo { }; + keeperrl = callPackage ../games/keeperrl { }; ### GAMES/LGAMES From a18b27a3f62c72da3c5a1ba6b75c6a188e9b0376 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 09:55:33 -0800 Subject: [PATCH 026/174] libdeltachat: 1.110.0 -> 1.111.0 Diff: https://github.com/deltachat/deltachat-core-rust/compare/v1.110.0...v1.111.0 Changelog: https://github.com/deltachat/deltachat-core-rust/blob/v1.111.0/CHANGELOG.md --- pkgs/development/libraries/libdeltachat/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index e1f4ff6373d6..89cad75d85a1 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libdeltachat"; - version = "1.110.0"; + version = "1.111.0"; src = fetchFromGitHub { owner = "deltachat"; repo = "deltachat-core-rust"; rev = "v${version}"; - hash = "sha256-SPBuStrBp9fnrLfFT2ec9yYItZsvQF9BHdJxi+plbgw="; + hash = "sha256-Fj5qrvlhty03+rxFqajdNoKFI+7qEHmKBXOLy3EonJ8="; }; patches = [ @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - hash = "sha256-Y4+CkaV9njHqmmiZnDtfZ5OwMVk583FtncxOgAqACkA="; + hash = "sha256-5s4onnL5aX4jFxEZWDU9xK6wSdTg7ZJZirxKTiImy38="; }; nativeBuildInputs = [ From 6f10ea96ec9149ef88cf0bd689efbca6e812c314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 14:55:00 -0800 Subject: [PATCH 027/174] deltachat-desktop: remove old patch --- .../deltachat-desktop/no-static-lib.patch | 39 ------------------- 1 file changed, 39 deletions(-) delete mode 100644 pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch diff --git a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch b/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch deleted file mode 100644 index 95238cf88524..000000000000 --- a/pkgs/applications/networking/instant-messengers/deltachat-desktop/no-static-lib.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fe7abe08..acdbe0d6 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -13,7 +13,6 @@ find_program(CARGO cargo) - - add_custom_command( - OUTPUT -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - COMMAND -@@ -38,13 +37,11 @@ add_custom_target( - lib_deltachat - ALL - DEPENDS -- "target/release/libdeltachat.a" - "target/release/libdeltachat.${DYNAMIC_EXT}" - "target/release/pkgconfig/deltachat.pc" - ) - - include(GNUInstallDirs) - install(FILES "deltachat-ffi/deltachat.h" DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}) --install(FILES "target/release/libdeltachat.a" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/libdeltachat.${DYNAMIC_EXT}" DESTINATION ${CMAKE_INSTALL_LIBDIR}) - install(FILES "target/release/pkgconfig/deltachat.pc" DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) -diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml -index a34a27ba..cf354abb 100644 ---- a/deltachat-ffi/Cargo.toml -+++ b/deltachat-ffi/Cargo.toml -@@ -12,7 +12,7 @@ categories = ["cryptography", "std", "email"] - - [lib] - name = "deltachat" --crate-type = ["cdylib", "staticlib"] -+crate-type = ["cdylib"] - - [dependencies] - deltachat = { path = "../", default-features = false } From 5e5d6e16ed90c73684b8426c7ca2567c7f1538fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 15:01:59 -0800 Subject: [PATCH 028/174] python310Packages.deltachat: inherit meta from libdeltachat --- pkgs/development/libraries/libdeltachat/default.nix | 2 +- pkgs/development/python-modules/deltachat/default.nix | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libdeltachat/default.nix b/pkgs/development/libraries/libdeltachat/default.nix index 89cad75d85a1..4da6dfe6abee 100644 --- a/pkgs/development/libraries/libdeltachat/default.nix +++ b/pkgs/development/libraries/libdeltachat/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/deltachat/deltachat-core-rust/"; changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${src.rev}/CHANGELOG.md"; license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda ]; + maintainers = with maintainers; [ dotlambda srapenne ]; platforms = platforms.unix; }; } diff --git a/pkgs/development/python-modules/deltachat/default.nix b/pkgs/development/python-modules/deltachat/default.nix index 92777f73e7ad..034be82d7e39 100644 --- a/pkgs/development/python-modules/deltachat/default.nix +++ b/pkgs/development/python-modules/deltachat/default.nix @@ -56,11 +56,8 @@ buildPythonPackage rec { "deltachat.message" ]; - meta = with lib; { + meta = libdeltachat.meta // { description = "Python bindings for the Delta Chat Core library"; homepage = "https://github.com/deltachat/deltachat-core-rust/tree/master/python"; - changelog = "https://github.com/deltachat/deltachat-core-rust/blob/${version}/python/CHANGELOG"; - license = licenses.mpl20; - maintainers = with maintainers; [ dotlambda srapenne ]; }; } From 782f4c779a1aec781fe2747f809964f9b6c0895f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 03:47:44 +0000 Subject: [PATCH 029/174] cloud-hypervisor: 29.0 -> 30.0 --- .../virtualization/cloud-hypervisor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/cloud-hypervisor/default.nix b/pkgs/applications/virtualization/cloud-hypervisor/default.nix index e6f5be057371..9c47cb4254f4 100644 --- a/pkgs/applications/virtualization/cloud-hypervisor/default.nix +++ b/pkgs/applications/virtualization/cloud-hypervisor/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "cloud-hypervisor"; - version = "29.0"; + version = "30.0"; src = fetchFromGitHub { owner = "cloud-hypervisor"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UH5HGXTRYcCBGhswHpGAn8a7rfl5j7gF8GgdpGj5Cb8="; + sha256 = "sha256-emy4Sk/j9G+Ou/9h1Kgd70MgbpYMobAXyqAE2LJeOio="; }; separateDebugInfo = true; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ openssl ] ++ lib.optional stdenv.isAarch64 dtc; - cargoSha256 = "sha256-30pUKZgGjjXP7UFY4y7XRXlHPF09mnyGWAhx7rPgs+o="; + cargoHash = "sha256-/BZN4Jsk3Hv9V0FSqQGHmVrEky6gAovNCd9tfiIHofg="; OPENSSL_NO_VENDOR = true; From 15ada3ac044e169d601929e493077dee17b8f65b Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 1 Mar 2023 10:10:10 +0800 Subject: [PATCH 030/174] pantheon.elementary-files: 6.2.2 -> 6.3.0 --- .../pantheon/apps/elementary-files/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index d2ec15c09c6c..df4690d05b25 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -28,7 +29,7 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.2.2"; + version = "6.3.0"; outputs = [ "out" "dev" ]; @@ -36,9 +37,18 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = "files"; rev = version; - sha256 = "sha256-YV7fcRaLaDwa0m6zbdhayCAqeON5nqEdQ1IUtDKu5AY="; + sha256 = "sha256-DS39jCeN+FFiEqJqxa5F2XRKF7SJsm2qi5KKb79guKo="; }; + patches = [ + # Avoid crash due to ref counting issues in Directory cache + # https://github.com/elementary/files/pull/2149 + (fetchpatch { + url = "https://github.com/elementary/files/commit/6a0d16e819dea2d0cd2d622414257da9433afe2f.patch"; + sha256 = "sha256-ijuSMZzVbSwWMWsK24A/24NfxjxgK/BU2qZlq6xLBEU="; + }) + ]; + nativeBuildInputs = [ desktop-file-utils meson From 62821edd2e685be68ece5dd50af4b493a4fa9dba Mon Sep 17 00:00:00 2001 From: nviets Date: Fri, 3 Mar 2023 18:31:19 -0600 Subject: [PATCH 031/174] This PR sets default SPARK_HOME and JAVA_HOME for R's sparklyr package using a patch in .onload. Preset value take precedence. SPARK_HOME points to python3Packages.pyspark rather than pkgs.spark because the former is actively maintained. --- pkgs/development/r-modules/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 7cfb8e54f275..82cc0955a4fb 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1275,6 +1275,17 @@ let ''; }); + sparklyr = old.sparklyr.overrideAttrs (attrs: { + # Pyspark's spark is full featured and better maintained than pkgs.spark + preConfigure = '' + substituteInPlace R/zzz.R \ + --replace ".onLoad <- function(...) {" \ + ".onLoad <- function(...) { + Sys.setenv(\"SPARK_HOME\" = Sys.getenv(\"SPARK_HOME\", unset = \"${pkgs.python3Packages.pyspark}/lib/${pkgs.python3Packages.python.libPrefix}/site-packages/pyspark\")) + Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.openjdk}\"))" + ''; + }); + proj4 = old.proj4.overrideAttrs (attrs: { preConfigure = '' substituteInPlace configure \ From 3af397636d07d949148e610c278060c7c0c8fb96 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 6 Mar 2023 18:44:22 +0000 Subject: [PATCH 032/174] evcc: 0.114.0 -> 0.114.1 https://github.com/evcc-io/evcc/releases/tag/0.114.1 --- pkgs/servers/home-automation/evcc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-automation/evcc/default.nix b/pkgs/servers/home-automation/evcc/default.nix index faadfff26e56..04a425169207 100644 --- a/pkgs/servers/home-automation/evcc/default.nix +++ b/pkgs/servers/home-automation/evcc/default.nix @@ -16,16 +16,16 @@ buildGo120Module rec { pname = "evcc"; - version = "0.114.0"; + version = "0.114.1"; src = fetchFromGitHub { owner = "evcc-io"; repo = pname; rev = version; - hash = "sha256-YPqt1UfXP2LGSopQuM4PXQJG3MmXg+5VjDpBKpV5axI="; + hash = "sha256-c+XHSO6waDyju8oXFWGYeaCCqyaYdU2JLXr+NDXijdU="; }; - vendorHash = "sha256-CNBwOVykQW7RUuf6oFTxO2DU6sd5IJVqN+6FPytQh+U="; + vendorHash = "sha256-O58Y9mfHmNUWtHmdO3hvZQbFlcqfZs0GmQDcx2RKRUs="; npmDeps = fetchNpmDeps { inherit src; From a6462d104a8d7004df933c892c9cf2d42c48ee97 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 19:16:28 +0000 Subject: [PATCH 033/174] iosevka-bin: 19.0.1 -> 20.0.0 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index c8f9a44c2e51..9c2825630629 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "19.0.1"; + version = "20.0.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 2193c0832263..a90310037123 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0h763gicj32dcwwcq976w81qyw5602vgybmicz0z6ryggm3r03bm"; - iosevka-aile = "13ihigp432jvlwgh3bb4nfv6yfav2dc0rc70l17dcirp746mw7ak"; - iosevka-curly = "1wx46yls9h179mlxcdhjbxl3s9w0pgrkr48mp97yg8dhpnpfckiv"; - iosevka-curly-slab = "0knqx70b1hhrvmwq72b199ql3gcby3cal7qhwvzfd9p238pla2lv"; - iosevka-etoile = "0lmx2wq0kvh0agfznqlmh2wj4hyc2cysbf4f60jiys78i81q5r8b"; - iosevka-slab = "08x6q0al6w73kbjwpkp8zbd7sgsbwdy8pg2i2n27iid4p10hhrd9"; - iosevka-ss01 = "1vqznn97s981mfx943m7bdvnh3h7v5syp8xq39jjb884c67ar5rg"; - iosevka-ss02 = "0vp85rwxgv2z2v2zxgr7fbqjxmp1zyg2bp1mdxxli6pamfrjb4yq"; - iosevka-ss03 = "131m574ngna9zyiqjgvpr64d6n7lbxnf045vs9i01agiqh7acp7p"; - iosevka-ss04 = "04i48dgzzpjgwca691ccd914mrw2xnhak2pwgaanac5ag90w9zv0"; - iosevka-ss05 = "1db7yn0x4vyvd2v06rmll48a842zwwigwf9jhs3m0lskiya5glaz"; - iosevka-ss06 = "1ymad9kpl0prbj220rnw5gchicb4hi731cgjn3lgjmw737kpg183"; - iosevka-ss07 = "1ljxbdswglw60z54px6fvk185l2h0zabgn96lgncb5wqhnn4zmd5"; - iosevka-ss08 = "10wj07g4yss3d1d81qrm1hy8dkjn5bqym61w4innqpljficqc8da"; - iosevka-ss09 = "0wf57sdyppba1ja5rbjn71fxlf2jh4d6m572jqqnz3fim729cll0"; - iosevka-ss10 = "1apffjqcfs1vaj6gg3svcjfc7n1b370h0bgra489bm1xv23lsxsv"; - iosevka-ss11 = "1zyiias5v4m7i9b2za2apkh8k7lynvyhqaxv5zha599w0di7q1zl"; - iosevka-ss12 = "1mh8gl078f9clkimpizycj2m2bi8jx2ckidrq2p2xdwhji068wjv"; - iosevka-ss13 = "0dhqiwdg9ng78nsr397v4ri3h682wn8yzjpw9ax5yfx7h9r85afm"; - iosevka-ss14 = "03xslqdwm5jn3ld89nvy2lxvxh35wlwijzg0q0pvl16d4a6n6pnh"; - iosevka-ss15 = "03v5miyz49838s5862jj2ssn7sixni91pb88ddzw47dhlwxyf8fy"; - iosevka-ss16 = "1hs5rv8kf7sscmdvmdxszy9y1zk4bd355789gfcgznxmsd4240ig"; - iosevka-ss17 = "0mv7ilvppwbc018fv2a6ghj0v1jd22n8z3al0hbhkn9gr9xixdj2"; - iosevka-ss18 = "0kyl0qqpn7l87cv40vgplqw1i0qncgxq0k8yxzgaz74ski48rf4y"; - sgr-iosevka = "0r19pllpdw3wah81ic0vzqbbrfl45cq401zx175arsxi38hz3lqa"; - sgr-iosevka-aile = "1w2gqj5s3v11n9pzifjjy0z7bdw3qx7pwyajajamqw75zb3jh0rf"; - sgr-iosevka-curly = "1v1q4chckiwzddcnpprsyxvii2kiim69iiim9xqx2wf3qp7sficp"; - sgr-iosevka-curly-slab = "1dbw51i7vqga65l2i9x1vvc098nqdqi396anwzbxpz0q32lv5s0p"; - sgr-iosevka-etoile = "1xx1q1j16fzi8z7xddbm38pm9xj71g4jyjkijqwzzfx7xphr5sk6"; - sgr-iosevka-fixed = "1vbsg6563q4xrr0mqf94ykaz6vdi3ns4c0qaryv8m60pqidvb11h"; - sgr-iosevka-fixed-curly = "14c4k9kbxqrrrmivfjxcmmaicmwflqph2z106s6zr6ifc8qxhk48"; - sgr-iosevka-fixed-curly-slab = "0krlp00b4pwwnfsigjfpi5ixvsllvr6kqj8r7hwlrq6xcqkb5wxd"; - sgr-iosevka-fixed-slab = "0zw26ldz2g1lwzman85wggb4igq8sllsi514cbi42firr16sa91q"; - sgr-iosevka-fixed-ss01 = "09igz4ax75gbqhvckr3l6j8lna81pqnql0bii3v0f41fjqk19w2z"; - sgr-iosevka-fixed-ss02 = "06p278qk1dq3kdq0nqbwspnxvrnhvxqssx8sa2cpcs2rp120a247"; - sgr-iosevka-fixed-ss03 = "1ipvi2sj5prbd11f7ihcgss5yd00aqgymzxqa6njh1j3c4hwacnr"; - sgr-iosevka-fixed-ss04 = "1pwx5r9avv97pcgsdpx5lw7lf19vg5kncn6viwrg659q0bar9bih"; - sgr-iosevka-fixed-ss05 = "0qmak7zdqmycbf3bndbhmkifcxy818w5vsp0pl2qnkklvq2y0v4r"; - sgr-iosevka-fixed-ss06 = "1b163h34h0yxh1jmpimjhjvj97dk2wvzcl7vnbiqwxvandlk6xrn"; - sgr-iosevka-fixed-ss07 = "0i4rc8424vjlqp38cj8h0c168419i0b5dxklsapbwahryzh1d1gp"; - sgr-iosevka-fixed-ss08 = "03kgjhin6cahbxgclckq8w05ax0nz4y392hwsxmvcz21p0cyglan"; - sgr-iosevka-fixed-ss09 = "1xbr1y8izvl36s7k0wbh1a9h5dlgn3dlpyjz3mic4a60xbf7l97d"; - sgr-iosevka-fixed-ss10 = "1kpi03gf30sfryvmi5syig7x0bcz0k2hpms0afrhaz0gprnnv2ap"; - sgr-iosevka-fixed-ss11 = "1v3yybp1aslp811ssjiglxknnnk7p1hymaa1lxdc5hn2hawxmzzn"; - sgr-iosevka-fixed-ss12 = "12yqrv9lvzwzps3zvhhyzdkf01j8h1abhgwnq1abma5h8mlydwkl"; - sgr-iosevka-fixed-ss13 = "08v2zjil62i01r3nqnvpbq51jsx3fxrcqzd1s625hbcywy4x6dvb"; - sgr-iosevka-fixed-ss14 = "1j97971kczdlkvwhcxj55yhqq5q4n1pk5k04pqffh2pl8zdzlj4h"; - sgr-iosevka-fixed-ss15 = "10l56ypqjnnxw33vgd8ajlwiyrvcglx0yh8faxj18if77pfsk82l"; - sgr-iosevka-fixed-ss16 = "0zfjld1s45ipwrxm1sv7kw2vs3f9lbs52zsgm31k8im6zr88rp0i"; - sgr-iosevka-fixed-ss17 = "0b0849jmbq8ync56bn6x7gld6sciyb72ffw95xjlsnfbx2gqyp8h"; - sgr-iosevka-fixed-ss18 = "0yyzc95b65427knjwas5yf4qsd831xz1fbwnvd0c6ngj9dc5xns0"; - sgr-iosevka-slab = "156n7pc9va263c4rg73cv8bizimkv6sabpk7784r423vahwv1s3v"; - sgr-iosevka-ss01 = "0bj0l93hgia8js7ikalm4ij3aa9yii1psnbymi9m5k3qxx8z4i2a"; - sgr-iosevka-ss02 = "0nrvx3grbf0j72gm749j3bpv92qd0g2riywflwa2nxdi9zgprwvh"; - sgr-iosevka-ss03 = "0a9k02r1fwb72dkvihm94s5fhgblz3lkjfwsywr81i5if3v7xnap"; - sgr-iosevka-ss04 = "04yd8zwibjqwc6ml52wwbg52aya2cxm2qk6czjb0rryvb7rx7bjy"; - sgr-iosevka-ss05 = "1syv7vigqzr42535fav2m945z4011xsnhm4sayxqkr4nx1vfx16i"; - sgr-iosevka-ss06 = "1qj2jf9550m37ssp4djmgqd5gk76kz15vxjaiyf2wmvwbl41iwl9"; - sgr-iosevka-ss07 = "1cx2lgqjy29wgb4a77j0ipy0ya3v8b6ipsdrdiqzpbl4j4bn0hbr"; - sgr-iosevka-ss08 = "005vzpcqwbgj4m8c8rd7qvjgjnzwh7napxxp9np5abwv4w6alnav"; - sgr-iosevka-ss09 = "0akhfl78fm8hxdhl4rd6d7bk7gin3hnk2y5cigxki403k415rwqc"; - sgr-iosevka-ss10 = "1aqw31vm4l5840nzg9dghkh33l8grsi7632qh9pm6rcj1x2vsqg4"; - sgr-iosevka-ss11 = "0gvc5rhb4291zy2zdp04ksqs65il3bwgdb4jkc8xq4v62h34i7cw"; - sgr-iosevka-ss12 = "0kra3lgzfbf2cf5p48djay22mwzgz604x9hxkmzq0h4r5rf41lfw"; - sgr-iosevka-ss13 = "1az0ficcg8i1fy37s8svrqi8fcqjz0rzqcprs5rz8m4qrhym0m9b"; - sgr-iosevka-ss14 = "1xg9is9l0dhzqaxq9dpkvdi4rsfkw5nr5jzccjvpvmw3d16kzjm2"; - sgr-iosevka-ss15 = "08r22a314aaqvsjca80k87kyi5nxwn0r63yvar6wn03sgay9hvlz"; - sgr-iosevka-ss16 = "1nqsf9y91llvsc5z1xhwlcnw499fl4n4zvmmsrp3l1gdcg7jcvyl"; - sgr-iosevka-ss17 = "1k5n0i2pffm403ra071ydyzvp5kiqj6q96yfwasqj2p39gjccp3j"; - sgr-iosevka-ss18 = "0kqdggh51x3djmmag485a0mygxckly3vxnzfi659fxfb8p6n0r1n"; - sgr-iosevka-term = "1k836142pkpwn3wnjxv329rbcycm66p24a7a0grnim9i8nsdq64g"; - sgr-iosevka-term-curly = "1sjz4xdvdxxd1d82mgrpafi081d13pvg2csl1g8hgv38x6n2s7j2"; - sgr-iosevka-term-curly-slab = "1vb7ccphwwl1rcb4xarigyj7jqfaglrxxa5p39vc0y3qa7rmjml6"; - sgr-iosevka-term-slab = "14l465qi0ap8qjyzydwda7zzw4xp5gvj6234hqr7p5g7wp8fv1nn"; - sgr-iosevka-term-ss01 = "0b0m1aa7mq0n8yv3m6bchjh50ixl32z1247vkfa7gi53qhprr4zn"; - sgr-iosevka-term-ss02 = "08cdlhgi6sidm62yw6v2n89bmwrgqx1rdwwx72lxhm1qmgzha7yz"; - sgr-iosevka-term-ss03 = "076vpwn8yzgx8r49fpcmbz2djqpr4wa4m6mfcfr5n733pczfnfj4"; - sgr-iosevka-term-ss04 = "13hyzzwhcsk7hsx8yn84zh2z1d6kzx7p7c820cfbgz2h6d6sag8j"; - sgr-iosevka-term-ss05 = "1j3wbf35h1f7qiypbw55fpq38qmp9z4wkvbzs4rhavhjihiw9jfs"; - sgr-iosevka-term-ss06 = "1cdphl4m1khjsi4a740jn7qcl2f7qqsbsngvpyvym1h6jxq8nm34"; - sgr-iosevka-term-ss07 = "1in8zdy791c9ghifgy0wrvsmkw6368h5kzgnqriy6rrabrrib8sq"; - sgr-iosevka-term-ss08 = "1ddxyz4s5rq5l9d1f1cazgcbgzbjzga1szm50l21vl5q11k8080i"; - sgr-iosevka-term-ss09 = "03rb552pqrzkki1xiqy4c06cbj7igdgi0sh8x6myycfikn8xjy32"; - sgr-iosevka-term-ss10 = "1cs03craw089c19wk1ia82i1461fyhxlrknk0bajqd5g1snl60by"; - sgr-iosevka-term-ss11 = "1l81kf1aq7i2lxas98i4xwzy71kjpx84l7gciwc18h41f3x2cs59"; - sgr-iosevka-term-ss12 = "1svp9v04m4v1njg89qjwxvarlvnxpfibxq40izig2gzimq534iyj"; - sgr-iosevka-term-ss13 = "0s9l2h3q6hazi9wrgf9xl9l9g38bb60k99dy219vzyfkl3y7vin4"; - sgr-iosevka-term-ss14 = "1ffmyh2sfnwrfn66x1wd8r00fnmm6v7mvzs3shigz971adgk61si"; - sgr-iosevka-term-ss15 = "12xygrna1g7jaz9hzkl0bnzxaky3gjmvbgy67fi65qk0fwhjb2yf"; - sgr-iosevka-term-ss16 = "13bnl8kg2dj7yr96ngm1y8hm5w56s4mgqpq1gi11667p95wil2sy"; - sgr-iosevka-term-ss17 = "07nh459pmfdcx6pcpzixr8d472zjqkp7122dxp6ifh0kmxnzys15"; - sgr-iosevka-term-ss18 = "0f4fg4sbvh35sf41z5lhg0af4rkm03vrgnkral5kdvvpabxznwwq"; + iosevka = "19f8p7zw7wbm8xbxm0kxv8k979bkqvx51hrckkc6nvddmigq1848"; + iosevka-aile = "0jcyx8wpw18d8igqr1hfrybrldkr0r9qs24jw4z0x5k4gbah7mmf"; + iosevka-curly = "0hj4lx8cyvib21cp065a56ag9jkwpzs74a93cf557j0x91k3wja0"; + iosevka-curly-slab = "10h58x5c32chvz4gdx8pifs1nd4ysnd4zq7pbjqsfv3h4lxz4r5h"; + iosevka-etoile = "16lbcms4rnx7dh016c15wpz94b932hfvlng78jv1lhdr13w7s60z"; + iosevka-slab = "0c8pxdz98xwd8sj1yc8gx2g2wfjyxk4951wmg55dibd3wj106rjp"; + iosevka-ss01 = "01awvcjp9yrvb57pr55ynp12kvjcjyl4yddbaqxh39if2hlp530n"; + iosevka-ss02 = "1j849rpz8lrarhnc020wy6m0lk3xizjrxihbc0bqld6pmjam6b7n"; + iosevka-ss03 = "118c1wfzkhg4918c246r5d8633qfcjz5356acl38jfz45nhhvls5"; + iosevka-ss04 = "0xsylys7ky1v0pb5w0d1dw9hsxpda4yqzjafbqgk98id3b08fvay"; + iosevka-ss05 = "0rpmw3cpzigv39nnirwmai118n5bnpmr58s90p20n4wgvr0rnfz2"; + iosevka-ss06 = "0pw41ncg2qjabi33ql2xp4a76gxxynybqbgrj7lk30dyr597v5v9"; + iosevka-ss07 = "0ww21ydwj0537xzk8f2przcd232fibzrsgil7pl5xmf2di226hx5"; + iosevka-ss08 = "195w4nd0901zlyjq7a6n7pwjwi2b5vnm4gj4y6692axi660jdv4j"; + iosevka-ss09 = "1h5jfrpply7ypc4h6ivxs30qkrbni51zkj78xz6nz4zbnp923yi0"; + iosevka-ss10 = "0j8i7ampwrlw8ka3vjad2z7ll2606ia8zp7c65i14m73v3vcyxfi"; + iosevka-ss11 = "1v76db3jfx82ifxs3mci6xsy6xkvadl40nnla1afb3d4ycd907ni"; + iosevka-ss12 = "0ax80i0nd7z5x92hrk8mpv3n1x6hhxgwlqm7niv9nqm78dgma8sz"; + iosevka-ss13 = "03nmlsgnphi3q5mm36l7a9rynijsjhh6g6b68xxxl3djmby613as"; + iosevka-ss14 = "1liapgr528qd88y6brhskcniddxanqqmx2qww21rqfyv9wl110wj"; + iosevka-ss15 = "19mhdl6dzb4003m00chnj9918l3mxrwfvfxh3wmvp6h4sfa6hymk"; + iosevka-ss16 = "0zsmjgv1i5bb3gk0zl0yi6lrrb8mikl1hlhi7p0vfapas7p5ylyy"; + iosevka-ss17 = "02p5q5wwn2awaifdknyki8q25c2f1mq59fa6w4vf6n3k95s8sys5"; + iosevka-ss18 = "1lpkcpqjpf2982pc9kk4dg788vwdpxg18i8mcwx6wa7wfkykrq24"; + sgr-iosevka = "0aar54rgmz9slpqj3vbwi6znmk2my3yc1kpmsv9yd2r4fk09s3ib"; + sgr-iosevka-aile = "0xc3n9xcmnkz6pb2z6jf4x0qn02hm5figa5w4ngmfn9zcpc4k7xs"; + sgr-iosevka-curly = "1daa9f6bkwqjg6wx87xnhj4hzmv5qbb8ggfhxwllkkw9q2ibv41k"; + sgr-iosevka-curly-slab = "0g4738nnkhzqj1mpg25f0jncrjqks0s1k8sjxl9478jdyh7i1ssz"; + sgr-iosevka-etoile = "0bf93cz940shiazdkg7cpvmwbdk7i8mcsafilvkm6pil71i9n54q"; + sgr-iosevka-fixed = "1025syksb3smhfbcarn00vhp5glz34cdyzsrnhxvm8xk7x285n0h"; + sgr-iosevka-fixed-curly = "1qhj71bn0j4wnv3hbk3557jzya0an79fyfaphbi1bqzcwxzlml42"; + sgr-iosevka-fixed-curly-slab = "1b4zgp8hyhqbzkgvy1dxrzgy0wbm2n95255j40xz88bflzj5ad4i"; + sgr-iosevka-fixed-slab = "04hiscy1y19rgwm837va9p6nr4vpsr0y45m5z6wpgd97fyylhdhz"; + sgr-iosevka-fixed-ss01 = "0iay9lrai7nrp6h1i1jhid50krdl1lq0fcn13lij39ppx0b5khdq"; + sgr-iosevka-fixed-ss02 = "10wja1qd12jvf3s1hd9z9qq9av86ds5ldk47b2nxzd31q704gk7l"; + sgr-iosevka-fixed-ss03 = "1lxz33da9wxlvjd75xrwxzyhr00i0iyg1r5myp8bdqxk58a20686"; + sgr-iosevka-fixed-ss04 = "1lghpzgb92hqm60djk2mg9cy55q2q8v1cdkc142iac6qdjk5q1yn"; + sgr-iosevka-fixed-ss05 = "14r08jnq04b8vg6svqzrswr3splmmkjni7jkz2zxhygpj8jacdq0"; + sgr-iosevka-fixed-ss06 = "1f70m7mxmazcg4rkh8bv06ykrj0qcxbaqkhaj0f9zmq9inw3fd7f"; + sgr-iosevka-fixed-ss07 = "03yp6zgp6020whzs3crhm63824413skxm4274aqy94f6853j5xlf"; + sgr-iosevka-fixed-ss08 = "1rjbnik2cp5r4n6w2bmr0cbcl7lvbrn4mwny43xljh84alsz8pa1"; + sgr-iosevka-fixed-ss09 = "1nzhqngfjagjajd5mlay12axvbzi35s7z8hyz254438w2a5dmqz2"; + sgr-iosevka-fixed-ss10 = "0p2d55aa8gkccpf49s0dwbfvmkr0ayvb7rli2hbn672m04kyjmia"; + sgr-iosevka-fixed-ss11 = "1y2jsj3fzim83x97nd3774qvgp91vmrdhad9ax9zg36wqzydipnz"; + sgr-iosevka-fixed-ss12 = "1rk8404ndbbhq310cn083q4p1f2k30gz5b26hb9r9q6782jadafl"; + sgr-iosevka-fixed-ss13 = "0p3jqjxglc0gk5r2cbp0xz7sfqh16y5hlq3rqx0nrx5bgpnqaglz"; + sgr-iosevka-fixed-ss14 = "14c5a4ib1f2nyfa062cicqxxqzrkrq3fxqckdi5rj2fc175c5rg8"; + sgr-iosevka-fixed-ss15 = "14v0a7pd4bfmw952j47xfdaf4vz3qimsy8dv7x0q1p3mgcy9nyni"; + sgr-iosevka-fixed-ss16 = "008rzn1gzc12cd0pxryylvqnim3gh9h74j5mv0idrv5z2yp8slai"; + sgr-iosevka-fixed-ss17 = "0x5cmsm0ixyl8chbxlz2dli6girhnxi678win9y6cvmi88jfiqs4"; + sgr-iosevka-fixed-ss18 = "1m5ryy02r44df69a95nf2r69a4pqgbhbn31c1zy3bi1fkww4xnrf"; + sgr-iosevka-slab = "0lwhsyb4p6bxk2vlvffzbn33ri89jy41jp89aanfgm64m8b9zswp"; + sgr-iosevka-ss01 = "1lgffhzkisqbqv5xy4b6qxram8dinxrzdrd7b4xf2vbvsp6pxrmg"; + sgr-iosevka-ss02 = "0g3fz7iliwk8zwmyklrschsmh8g4dg7p767ypmb576q580g2iin6"; + sgr-iosevka-ss03 = "1pdqmzjds8aa4ycyf95c5gri068x13xv66285z732gsrbbdmw6px"; + sgr-iosevka-ss04 = "17ps0wp1ibwhivl9h6j4n272cv8x6imd6vh85h48hqalr7lbmz5n"; + sgr-iosevka-ss05 = "0m73nzvi5dd1g3g0fq7bji5avq60kzpg53wc375nxkc7w1pygzhn"; + sgr-iosevka-ss06 = "1pfk3nbmbih553qba3w0281y2gnn1a86pmsz9zkmv16chjlwq9xn"; + sgr-iosevka-ss07 = "0g27zkj56hsmzj312fx47p8h4k4h37jm5jw7yz80lbj6cp2qyg1g"; + sgr-iosevka-ss08 = "0cykprs0p1m6pkpynix80lanwvspmmir5mgkjpd2bq1yn24krgcg"; + sgr-iosevka-ss09 = "04ajyvcv6d27ll75a09i0vw5731fgmqil1zs4vl5y96vnjzym270"; + sgr-iosevka-ss10 = "0gvjj5kskaf68svlygg2k1a59gzjbn8v2amp7krfdgcvzvi5rymw"; + sgr-iosevka-ss11 = "0gd6dbpmb345qly2fgl094cl24gpih2p0a9a1jj4qwf3fwj4i4kr"; + sgr-iosevka-ss12 = "0gf0hmdr2rgzx9ab0cgcpzx2wczn5c7qs3nblghazfyydi85na5y"; + sgr-iosevka-ss13 = "1lr9kjmq306q1ac745vnhs53c6mlqacx2qiq6j8ac26ny4fyp04k"; + sgr-iosevka-ss14 = "16q2gwysiqn1l49q6wm4g636alcljlbjn9xhqy8pf9jw0574rxbn"; + sgr-iosevka-ss15 = "0ic76dz64dqii1qix6hdw2pvzfphbd6lmh5j6ci4fb1m6n8gb17c"; + sgr-iosevka-ss16 = "1rxkd0yl9savj7ic3mnap9hi7lmsdnh3b3fylhnbx415cdyzcn4i"; + sgr-iosevka-ss17 = "1j8my340drr9llr5bws9zlz7m2nkj45p635irginpjrx8678l66q"; + sgr-iosevka-ss18 = "1r8kzdc8ibj7v0nm6yxssfl9mrcyz07fv8x1rqzh07bw66qwr1az"; + sgr-iosevka-term = "06r78ags2b9psayl1mk98i2n7r7mp5jrfs6bgydg8rw76wzms8pp"; + sgr-iosevka-term-curly = "1mrz6rcizk1w8f1hcbs001pmrhdxdw4mx5arg0csf42smrazwnah"; + sgr-iosevka-term-curly-slab = "014jqbcmw1779zg6kgxq5ag5830bspb0qfkwj024lj8h766msanr"; + sgr-iosevka-term-slab = "0kkz3hhrv769m4qbfxwahb3fv8zwj9vinzblbjjs0zv839kxw1s1"; + sgr-iosevka-term-ss01 = "1y6v2pnqxs8hlkp3zj078d1p9qfv33bmrg4n32mfqv6r843x079y"; + sgr-iosevka-term-ss02 = "162hd1p55z2r5svmhb3l79w8wgv3pwk2zsjqdz3idbp0hycn3nfv"; + sgr-iosevka-term-ss03 = "0azsdl46wmxv3rskdma16l631sjdg4gdb83998gmg4gaixxw6v0c"; + sgr-iosevka-term-ss04 = "05czhnpnxwbx3r6h6kpj9cs5766m49wr37g32dhxayk0yxwqdw3k"; + sgr-iosevka-term-ss05 = "0l090r9g1wzz05zc581qnlhs6j315vxgmwmn7xclifpq7q5hqbcf"; + sgr-iosevka-term-ss06 = "0g2m6g94j8js213ni73pxb8vw120fn6hrk9c2brr8xazpqfb0flh"; + sgr-iosevka-term-ss07 = "1gizqdwfji038wgziqzvqwnllid9x25q1v7hny9dv13cadg853yf"; + sgr-iosevka-term-ss08 = "0hgwxnrv51svqqyaf13w9gh27id8afvv83lf3s3dacif3sfnqmfl"; + sgr-iosevka-term-ss09 = "07w671y8754wwb09gjr3pllmgkwql9idv63w8qrjfs2r01vz4lly"; + sgr-iosevka-term-ss10 = "06d02iwk19nb3ayn21qmwlhvfsq9alrzh5xvgjgzcp86216rzfpw"; + sgr-iosevka-term-ss11 = "18vjdmaw45mcjp60yh6s2rwj0gbk7cqxk7chxhmac4yrw4nps2c9"; + sgr-iosevka-term-ss12 = "1r586535bphhnbr1ka5sffwcyd1fbfk9rkg3gjd5b329xsrr7ifc"; + sgr-iosevka-term-ss13 = "19q5gcz5rcv77gmy8z46mjs8ykx3zqf0wgb1a9izvzl0656fk6lp"; + sgr-iosevka-term-ss14 = "19sy7bmnnbpa677cwajr0wnpii4apz113xcdnw8nk734ivl3f8sb"; + sgr-iosevka-term-ss15 = "08c1zlmnvhvmy3312jf608j45g4mv1if46jh734mi7fk4q2ylxn5"; + sgr-iosevka-term-ss16 = "0x1vll4hyw9bkjvv88lnwvma46p7lvwlc2qb7pnjkx21cacdf9f1"; + sgr-iosevka-term-ss17 = "07wl4f4ysigi80s6pzznydnqzx426hhvwkn78jrc1sdvas78vml5"; + sgr-iosevka-term-ss18 = "1ha0mahcrxhqvbhcmfsfv49jbsz8w2s7kpvf8j22ws1v0fjnx3l6"; } From a233af68773ab7dbf6157a612ae0eaed02abe98c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 21:30:21 +0000 Subject: [PATCH 034/174] android-tools: 33.0.3p2 -> 34.0.0 --- pkgs/tools/misc/android-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/android-tools/default.nix b/pkgs/tools/misc/android-tools/default.nix index 18d7bf02ed83..adc8856f1672 100644 --- a/pkgs/tools/misc/android-tools/default.nix +++ b/pkgs/tools/misc/android-tools/default.nix @@ -9,11 +9,11 @@ in stdenv.mkDerivation rec { pname = "android-tools"; - version = "33.0.3p2"; + version = "34.0.0"; src = fetchurl { url = "https://github.com/nmeum/android-tools/releases/download/${version}/android-tools-${version}.tar.xz"; - hash = "sha256-a/a1LXOJ55/JK2PMIGRR7kL8T32naddpIhk+mNdfVgQ="; + hash = "sha256-+I7FaGk39/svaJw7BQYSPyOZJ2oUZzFksPlUVKTHuXo="; }; nativeBuildInputs = [ cmake pkg-config perl go ]; From 983d0143d07d494d10cb7368d18852aa815fb3f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Mar 2023 21:35:31 +0000 Subject: [PATCH 035/174] autorestic: 1.7.6 -> 1.7.7 --- pkgs/tools/backup/autorestic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index 163172145415..b4c873554241 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "autorestic"; - version = "1.7.6"; + version = "1.7.7"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jlCCARbZSAHK0ojlTdtUl7fo+MAtuQYo64lZeKyQ9ho="; + sha256 = "sha256-drinKUJAlgY1PEP7NHOFfmvDVib1AFjT8hRktQgxJ4A="; }; vendorHash = "sha256-K3+5DRXcx56sJ4XHikVtmoxmpJbBeAgPkN9KtHVgvYA="; From 16818343f11972ed7f591080992ba146790cc2f1 Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Sun, 5 Mar 2023 01:22:46 +0100 Subject: [PATCH 036/174] maintainers: add apfelkuchen6 --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 94e3737b2459..ba068de02034 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1096,6 +1096,12 @@ githubId = 1078530; name = "Alexandre Peyroux"; }; + apfelkuchen6 = { + email = "apfelkuchen6@hrnz.li"; + github = "apfelkuchen6"; + githubId = 73002165; + name = "apfelkuchen6"; + }; applePrincess = { email = "appleprincess@appleprincess.io"; github = "applePrincess"; From 481f02f7dd1b21ddfc363ec30b99fcfac04deaec Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Tue, 7 Mar 2023 01:53:06 +0100 Subject: [PATCH 037/174] mpv: allow scripts to add wrapper args --- pkgs/applications/video/mpv/wrapper.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/video/mpv/wrapper.nix b/pkgs/applications/video/mpv/wrapper.nix index e9be744ed01c..0dd735071f00 100644 --- a/pkgs/applications/video/mpv/wrapper.nix +++ b/pkgs/applications/video/mpv/wrapper.nix @@ -18,6 +18,7 @@ let # expected to have a `scriptName` passthru attribute that points to the # name of the script that would reside in the script's derivation's # `$out/share/mpv/scripts/`. + # A script can optionally also provide an `extraWrapperArgs` passthru attribute. scripts ? [], extraUmpvWrapperArgs ? [] }: @@ -49,6 +50,8 @@ let # attribute of the script derivation from the `scripts` "--script=${script}/share/mpv/scripts/${script.scriptName}" ] + # scripts can also set the `extraWrapperArgs` passthru + ++ (script.extraWrapperArgs or []) ) scripts )) ++ extraMakeWrapperArgs) ; From 266226903f343f867d1d217cab2b8e56f4fdefdc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Mar 2023 18:12:50 -0800 Subject: [PATCH 038/174] python310Packages.doorbirdpy: 2.2.1 -> 2.2.2 --- .../python-modules/doorbirdpy/default.nix | 24 ++++++++++--------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/doorbirdpy/default.nix b/pkgs/development/python-modules/doorbirdpy/default.nix index 54750b63a933..c06ab09a4d6f 100644 --- a/pkgs/development/python-modules/doorbirdpy/default.nix +++ b/pkgs/development/python-modules/doorbirdpy/default.nix @@ -1,29 +1,31 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitLab , requests -, pythonOlder +, pytestCheckHook +, requests-mock }: buildPythonPackage rec { pname = "doorbirdpy"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; - disabled = pythonOlder "3.7"; - - src = fetchPypi { - pname = "DoorBirdPy"; - inherit version; - hash = "sha256-o6d8xXF5OuiF0B/wwYhDAZr05D84MuxHBY96G2XHILU="; + src = fetchFromGitLab { + owner = "klikini"; + repo = "doorbirdpy"; + rev = version; + hash = "sha256-pgL4JegD1gANefp7jLYb74N9wgpkDgQc/Fe+NyLBrkA="; }; propagatedBuildInputs = [ requests ]; - # no tests on PyPI, no tags on GitLab - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + requests-mock + ]; pythonImportsCheck = [ "doorbirdpy" From be1d82d5ca6c3e80442d91b1a45af66776326495 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Mar 2023 18:57:55 -0800 Subject: [PATCH 039/174] python310Packages.openapi-schema-validator: 0.3.4 -> 0.4.3 Diff: https://github.com/p1c2u/openapi-schema-validator/compare/refs/tags/0.3.4...0.4.3 --- .../openapi-schema-validator/default.nix | 21 ++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/openapi-schema-validator/default.nix b/pkgs/development/python-modules/openapi-schema-validator/default.nix index d3c121ed94e7..456f57e3309d 100644 --- a/pkgs/development/python-modules/openapi-schema-validator/default.nix +++ b/pkgs/development/python-modules/openapi-schema-validator/default.nix @@ -5,31 +5,38 @@ , pytestCheckHook , isodate , jsonschema -, pytest-cov , rfc3339-validator -, six -, strict-rfc3339 }: buildPythonPackage rec { pname = "openapi-schema-validator"; - version = "0.3.4"; + version = "0.4.3"; format = "pyproject"; src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-0nKAeqZCfzYFsV18BDsSws/54FmRoy7lQSHguI6m3Sc="; + hash = "sha256-rp0Oq5WWPpna5rHrq/lfRNxjK5/FLgPZ5uzVfDT/YiI="; }; + postPatch = '' + sed -i "/--cov/d" pyproject.toml + ''; + nativeBuildInputs = [ poetry-core ]; - propagatedBuildInputs = [ isodate jsonschema six strict-rfc3339 rfc3339-validator ]; + propagatedBuildInputs = [ + jsonschema + rfc3339-validator + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; - nativeCheckInputs = [ pytestCheckHook pytest-cov ]; pythonImportsCheck = [ "openapi_schema_validator" ]; meta = with lib; { From f1479a8e9ff0c57a4d90b7ea1a86777be152330c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Mar 2023 19:02:40 -0800 Subject: [PATCH 040/174] python310Packages.openapi-spec-validator: 0.5.1 -> 0.5.5 Diff: https://github.com/p1c2u/openapi-spec-validator/compare/0.5.1...0.5.5 --- .../openapi-spec-validator/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/openapi-spec-validator/default.nix b/pkgs/development/python-modules/openapi-spec-validator/default.nix index 371661e2feb8..296bcd7b9932 100644 --- a/pkgs/development/python-modules/openapi-spec-validator/default.nix +++ b/pkgs/development/python-modules/openapi-spec-validator/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub , poetry-core -, setuptools # propagates , importlib-resources @@ -22,29 +22,30 @@ buildPythonPackage rec { pname = "openapi-spec-validator"; - version = "0.5.1"; + version = "0.5.5"; format = "pyproject"; + disabled = pythonOlder "3.7"; + # no tests via pypi sdist src = fetchFromGitHub { owner = "p1c2u"; repo = pname; rev = version; - hash = "sha256-8VhD57dNG0XrPUdcq39GEfHUAgdDwJ8nv+Lp57OpTLg="; + hash = "sha256-t7u0p6V2woqIFsqywv7k5s5pbbnmcn45YnlFWH1PEi4="; }; nativeBuildInputs = [ poetry-core - setuptools ]; propagatedBuildInputs = [ - importlib-resources jsonschema jsonschema-spec lazy-object-proxy openapi-schema-validator - pyyaml + ] ++ lib.optionals (pythonOlder "3.9") [ + importlib-resources ]; passthru.optional-dependencies.requests = [ From 9ca5356d8d4475a12e9ad4d3d611fddbc02d4aa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Mar 2023 18:52:30 -0800 Subject: [PATCH 041/174] python310Packages.openapi-core: 0.16.6 -> 0.17.0 Diff: https://github.com/p1c2u/openapi-core/compare/refs/tags/0.16.6...0.17.0 Changelog: https://github.com/python-openapi/openapi-core/releases/tag/0.17.0 --- .../python-modules/openapi-core/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/openapi-core/default.nix b/pkgs/development/python-modules/openapi-core/default.nix index 987f5cf6b14d..e024138b4cfb 100644 --- a/pkgs/development/python-modules/openapi-core/default.nix +++ b/pkgs/development/python-modules/openapi-core/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "openapi-core"; - version = "0.16.6"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "p1c2u"; repo = "openapi-core"; rev = "refs/tags/${version}"; - hash = "sha256-cpWEZ+gX4deTxMQ5BG+Qh863jcqUkOlNSY3KtOwOcBo="; + hash = "sha256-LxCaP8r+89UmV/VfqtA/mWV/CXd6ZfRQnNnM0Jde7ko="; }; postPatch = '' @@ -84,11 +84,7 @@ buildPythonPackage rec { pytestCheckHook responses webob - ] ++ passthru.optional-dependencies.flask - ++ passthru.optional-dependencies.falcon - ++ passthru.optional-dependencies.django - ++ passthru.optional-dependencies.starlette - ++ passthru.optional-dependencies.requests; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); disabledTestPaths = [ # Requires secrets and additional configuration From 2689297c50e2041d7f1846580f6bd4d784cd45f9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 042/174] rustpython: 2022-10-11 -> 0.2.0 --- .../interpreters/python/rustpython/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index e3e2ca8c18cd..36ce552d7a3a 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "rustpython"; - version = "unstable-2022-10-11"; + version = "0.2.0"; src = fetchFromGitHub { owner = "RustPython"; repo = "RustPython"; - rev = "273ffd969ca6536df06d9f69076c2badb86f8f8c"; - sha256 = "sha256-t/3++EeP7a8t2H0IEPLogBri7+6u+2+v+lNb4/Ty1/w="; + rev = "v${version}"; + hash = "sha256-RNUOBBbq4ca9yEKNj5TZTOQW0hruWOIm/G+YCHoJ19U="; }; - cargoHash = "sha256-Pv7SK64+eoK1VUxDh1oH0g1veWoIvBhiZE9JI/alXJ4="; + cargoHash = "sha256-PYSsv/dZ3dxferTDbRLF9T8GGj9kZ3ixWNglQKtA3pE="; # freeze the stdlib into the rustpython binary cargoBuildFlags = [ "--features=freeze-stdlib" ]; From 851e70627a9c4c22dd77bc182b5d1feda59ceea3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 043/174] python310Packages.evtx: fix build on darwin --- pkgs/development/python-modules/evtx/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/evtx/default.nix b/pkgs/development/python-modules/evtx/default.nix index af6f36ec6f9e..b949864dc7aa 100644 --- a/pkgs/development/python-modules/evtx/default.nix +++ b/pkgs/development/python-modules/evtx/default.nix @@ -5,6 +5,7 @@ , pytestCheckHook , pythonOlder , rustPlatform +, libiconv }: buildPythonPackage rec { @@ -32,6 +33,10 @@ buildPythonPackage rec { maturinBuildHook ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -46,6 +51,5 @@ buildPythonPackage rec { changelog = "https://github.com/omerbenamram/pyevtx-rs/releases/tag/${version}"; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; - broken = stdenv.isDarwin; }; } From bb5edc482e691dbf9d0a28348684b2af611c6711 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 7 Mar 2023 04:20:00 +0000 Subject: [PATCH 044/174] rustpython: fix build on aarch64-linux --- .../interpreters/python/rustpython/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/interpreters/python/rustpython/default.nix b/pkgs/development/interpreters/python/rustpython/default.nix index 36ce552d7a3a..b00631ad71a4 100644 --- a/pkgs/development/interpreters/python/rustpython/default.nix +++ b/pkgs/development/interpreters/python/rustpython/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , SystemConfiguration , python3 +, fetchpatch }: rustPlatform.buildRustPackage rec { @@ -19,6 +20,14 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-PYSsv/dZ3dxferTDbRLF9T8GGj9kZ3ixWNglQKtA3pE="; + patches = [ + # Fix aarch64 compatibility for sqlite. Remove with the next release. https://github.com/RustPython/RustPython/pull/4499 + (fetchpatch { + url = "https://github.com/RustPython/RustPython/commit/9cac89347e2276fcb309f108561e99f4be5baff2.patch"; + hash = "sha256-vUPQI/5ec6/36Vdtt7/B2unPDsVrGh5iEiSMBRatxWU="; + }) + ]; + # freeze the stdlib into the rustpython binary cargoBuildFlags = [ "--features=freeze-stdlib" ]; From 46b4fad03e60e68a728ace81aaf8db2b6af7d31a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 07:07:18 +0000 Subject: [PATCH 045/174] conftest: 0.39.1 -> 0.39.2 --- pkgs/development/tools/conftest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix index d122d5ea88e6..23d4e7a1b43e 100644 --- a/pkgs/development/tools/conftest/default.nix +++ b/pkgs/development/tools/conftest/default.nix @@ -6,15 +6,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.39.1"; + version = "0.39.2"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "refs/tags/v${version}"; - hash = "sha256-CSvsHp89FugOQ0PLb26PH1nnw5bOVk7bU5q3lJh0HiU="; + hash = "sha256-QthFKdO68kFePAMQX239f4HJNG5ZkOyxEq6zmHuDNE4="; }; - vendorHash = "sha256-HMHG7vGfic9ZseTyM9Fs2fFsJzMTKjHpz67I+WkMJXk="; + vendorHash = "sha256-6JYn8o696uDKayw5zLoys5UNIFS2FK2LOZw62rgP72Y="; ldflags = [ "-s" From 42441152b4bc50d8b92f59b03ddba55c5a02317a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 08:49:33 +0100 Subject: [PATCH 046/174] python310Packages.peaqevcore: 12.2.6 -> 12.2.7 --- 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 be36f758f941..03591377a07e 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 = "12.2.6"; + version = "12.2.7"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-IAqXp/d0f1khhNpkp4uQmxqJ4Xh8Nl87i+iMa3U9EDM="; + hash = "sha256-CtOicqS4PBDcsLrIyu3vek5Gi73vfE2vZfIo83mJgS4="; }; postPatch = '' From a3dcdef4a78b4a459fd0aa06d99ad82623826131 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 08:02:32 +0000 Subject: [PATCH 047/174] chezmoi: 2.31.0 -> 2.31.1 --- pkgs/tools/misc/chezmoi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix index cdb5e7bbd8ad..c6a5f9aafe84 100644 --- a/pkgs/tools/misc/chezmoi/default.nix +++ b/pkgs/tools/misc/chezmoi/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "chezmoi"; - version = "2.31.0"; + version = "2.31.1"; src = fetchFromGitHub { owner = "twpayne"; repo = "chezmoi"; rev = "v${version}"; - hash = "sha256-yozW+Yb8uHOA5NfAQ+QWVylgJUM8b8DTKPUHxCNi9SU="; + hash = "sha256-zSr4lvrrGM+BgPWtq/J7vnB1lWHI8PmqP/N5csFL9kU="; }; - vendorHash = "sha256-8kG3GTb3dpLNeFppuLwvB+cjM0K1mp3QJgXTDieLgW8="; + vendorHash = "sha256-/CGdz6wIpEZrhZe6IYa43Z3bpN1byeSi9h4dTxCMxog="; doCheck = false; From bb26db7dd930499c3a759623ee05473953094cfd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 18:17:22 +0100 Subject: [PATCH 048/174] python310Packages.nestedtext: add changelog to meta --- pkgs/development/python-modules/nestedtext/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index c8b0c77b7a39..4751e17e0b6c 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -37,6 +37,7 @@ buildPythonPackage rec { non-programmers. ''; homepage = "https://nestedtext.org"; + changelog = "https://github.com/KenKundert/nestedtext/blob/v${version}/doc/releases.rst"; license = licenses.mit; maintainers = with maintainers; [ jeremyschlatter ]; }; From 49a676052101f4b2206a2b559181ab6050c0eac4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 18:21:03 +0100 Subject: [PATCH 049/174] python310Packages.nestedtext: equalize --- .../python-modules/nestedtext/default.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 4751e17e0b6c..572091daa874 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -1,8 +1,10 @@ -{ lib, buildPythonPackage, fetchFromGitHub -, inform -, pytestCheckHook +{ lib +, buildPythonPackage , docopt +, fetchFromGitHub +, inform , natsort +, pytestCheckHook , voluptuous }: @@ -13,15 +15,26 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "KenKundert"; repo = "nestedtext"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; fetchSubmodules = true; sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y"; }; - propagatedBuildInputs = [ inform ]; + propagatedBuildInputs = [ + inform + ]; - nativeCheckInputs = [ pytestCheckHook docopt natsort voluptuous ]; - pytestFlagsArray = [ "--ignore=build" ]; # Avoids an ImportMismatchError. + nativeCheckInputs = [ + docopt + natsort + pytestCheckHook + voluptuous + ]; + + pytestFlagsArray = [ + # Avoids an ImportMismatchError. + "--ignore=build" + ]; meta = with lib; { description = "A human friendly data format"; From dba4f3816648b2a1a53df0b7b4ad23619d97e7f7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 18:22:36 +0100 Subject: [PATCH 050/174] python310Packages.nestedtext: disable on unsupported Python releases --- pkgs/development/python-modules/nestedtext/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 572091daa874..4f1705343b24 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -5,12 +5,16 @@ , inform , natsort , pytestCheckHook +, pythonOlder , voluptuous }: buildPythonPackage rec { pname = "nestedtext"; version = "1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "KenKundert"; From 6509273d853b8d0b3d90fe5edfd43397525b1753 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 25 Feb 2023 19:56:33 +0100 Subject: [PATCH 051/174] python310Packages.nestedtext: 1.2 -> 3.5 Changelog: https://github.com/KenKundert/nestedtext/blob/v3.5/doc/releases.rst --- .../python-modules/nestedtext/default.nix | 38 +++++++++++++++---- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/nestedtext/default.nix b/pkgs/development/python-modules/nestedtext/default.nix index 4f1705343b24..5b5aa8bfc5b7 100644 --- a/pkgs/development/python-modules/nestedtext/default.nix +++ b/pkgs/development/python-modules/nestedtext/default.nix @@ -2,17 +2,20 @@ , buildPythonPackage , docopt , fetchFromGitHub +, flitBuildHook +, hypothesis , inform -, natsort +, nestedtext , pytestCheckHook , pythonOlder +, quantiphy , voluptuous }: buildPythonPackage rec { pname = "nestedtext"; - version = "1.2"; - format = "setuptools"; + version = "3.5"; + format = "pyproject"; disabled = pythonOlder "3.7"; @@ -20,26 +23,47 @@ buildPythonPackage rec { owner = "KenKundert"; repo = "nestedtext"; rev = "refs/tags/v${version}"; - fetchSubmodules = true; - sha256 = "1dwks5apghg29aj90nc4qm0chk195jh881297zr1wk7mqd2n159y"; + hash = "sha256-RGCcrGsDkBhThuUZd2LuuyXG9r1S7iOA75HYRxkwUrU="; }; - propagatedBuildInputs = [ + nativeBuildInputs = [ + flitBuildHook + ]; + + propagatedBuildInputs = [ inform ]; nativeCheckInputs = [ docopt - natsort + hypothesis + quantiphy pytestCheckHook voluptuous ]; + # Tests depend on quantiphy. To avoid infinite recursion, tests are only + # enabled when building passthru.tests. + doCheck = false; + pytestFlagsArray = [ # Avoids an ImportMismatchError. "--ignore=build" ]; + disabledTestPaths = [ + # Examples are prefixed with test_ + "examples/" + ]; + + passthru.tests = { + runTests = nestedtext.overrideAttrs (_: { doCheck = true; }); + }; + + pythonImportsCheck = [ + "nestedtext" + ]; + meta = with lib; { description = "A human friendly data format"; longDescription = '' From cab5d3d75b6488ce5614b7e4fd074f74919a4363 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 08:17:34 +0000 Subject: [PATCH 052/174] circleci-cli: 0.1.23667 -> 0.1.23816 --- pkgs/development/tools/misc/circleci-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index 33ad5756ee18..6a79e1ab879f 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.23667"; + version = "0.1.23816"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-VrRdcp03B/Q3tUD/WKKKr7svNiOXFMM2s6EuIda6z6g="; + sha256 = "sha256-Ab22+fEHQry8dRIElFydxQXVWOXLo4Ch8Q26F8qPUDw="; }; - vendorHash = "sha256-6l2cblbpIORSqhu2rjzmDl/7y/Vki7fX/b5002jDKd0="; + vendorHash = "sha256-8HAiZ0zEJ+nnCsSUrNv0qQlvROCyNXO49fLWnKi6anE="; nativeBuildInputs = [ installShellFiles ]; From d6630686893dc78f4d2ab908d845cae131443224 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 09:29:26 +0100 Subject: [PATCH 053/174] python310Packages.parametrize-from-file: disable failing test --- .../python-modules/parametrize-from-file/default.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/parametrize-from-file/default.nix b/pkgs/development/python-modules/parametrize-from-file/default.nix index c020992bee22..38370a1c805a 100644 --- a/pkgs/development/python-modules/parametrize-from-file/default.nix +++ b/pkgs/development/python-modules/parametrize-from-file/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { src = fetchPypi { inherit version; pname = "parametrize_from_file"; - sha256 = "1c91j869n2vplvhawxc1sv8km8l53bhlxhhms43fyjsqvy351v5j"; + hash = "sha256-suxQht9YS+8G0RXCTuEahaI60daBda7gpncLmwySIbE="; }; patches = [ @@ -54,7 +54,14 @@ buildPythonPackage rec { toml ]; - pythonImportsCheck = [ "parametrize_from_file" ]; + pythonImportsCheck = [ + "parametrize_from_file" + ]; + + disabledTests = [ + # https://github.com/kalekundert/parametrize_from_file/issues/19 + "test_load_suite_params_err" + ]; meta = with lib; { description = "Read unit test parameters from config files"; From 2a68c63fc6c89ee7b9039e63cb612eea9dbc0c01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 09:39:46 +0100 Subject: [PATCH 054/174] stunnel: 5.67 -> 5.69 --- pkgs/tools/networking/stunnel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/stunnel/default.nix b/pkgs/tools/networking/stunnel/default.nix index 4be019c5fa07..5240302c1f6c 100644 --- a/pkgs/tools/networking/stunnel/default.nix +++ b/pkgs/tools/networking/stunnel/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "stunnel"; - version = "5.67"; + version = "5.69"; outputs = [ "out" "doc" "man" ]; src = fetchurl { url = "https://www.stunnel.org/archive/${lib.versions.major version}.x/${pname}-${version}.tar.gz"; - sha256 = "3086939ee6407516c59b0ba3fbf555338f9d52f459bcab6337c0f00e91ea8456"; + sha256 = "sha256-H/fZ8wiEx1uYyKCk4VNPp5rcraIyJjXmeHM3tOOP24E="; # please use the contents of "https://www.stunnel.org/downloads/stunnel-${version}.tar.gz.sha256", # not the output of `nix-prefetch-url` }; From 0fd67b467ad31cb7af901989df3e5e4a59f9e91d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 09:15:05 +0000 Subject: [PATCH 055/174] gobgp: 3.11.0 -> 3.12.0 --- pkgs/tools/networking/gobgp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/gobgp/default.nix b/pkgs/tools/networking/gobgp/default.nix index b0de8d09c7af..d624d1f48d75 100644 --- a/pkgs/tools/networking/gobgp/default.nix +++ b/pkgs/tools/networking/gobgp/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gobgp"; - version = "3.11.0"; + version = "3.12.0"; src = fetchFromGitHub { owner = "osrg"; repo = "gobgp"; rev = "v${version}"; - sha256 = "sha256-UGRGJqeVWrt8NVf9d5Mk7k+k2Is/fwHv2X0hmyXvTZs="; + sha256 = "sha256-keev3DZ3xN5UARuYKfSdox0KKBjrM5RoMD273Aw0AGY="; }; - vendorHash = "sha256-9Vi8qrcFC2SazcGVgAf1vbKvxd8rTMgye63wSCaFonk="; + vendorHash = "sha256-5lRW9gWQZRRqZoVB16kI1VEnr0XsiPtLUuioK/0f8w0="; postConfigure = '' export CGO_ENABLED=0 From 7939447527bf256129c8b44883f31edb261de165 Mon Sep 17 00:00:00 2001 From: nviets Date: Tue, 7 Mar 2023 11:08:38 +0100 Subject: [PATCH 056/174] Update pkgs/development/r-modules/default.nix MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Justin Bedő --- pkgs/development/r-modules/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 82cc0955a4fb..3b41bb3e7c9d 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -1282,7 +1282,7 @@ let --replace ".onLoad <- function(...) {" \ ".onLoad <- function(...) { Sys.setenv(\"SPARK_HOME\" = Sys.getenv(\"SPARK_HOME\", unset = \"${pkgs.python3Packages.pyspark}/lib/${pkgs.python3Packages.python.libPrefix}/site-packages/pyspark\")) - Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.openjdk}\"))" + Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.jdk}\"))" ''; }); From e34328aa3a0949f955ee96317c3bcf70f5c5ec07 Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Thu, 23 Feb 2023 10:10:10 +0100 Subject: [PATCH 057/174] netcoredbg: 2.0.0-895 -> 2.2.0-961 * arm64.patch for compilation on aarch64-* * darwin.patch for properly detecting possible arm64 darwin architectures * coreclr is now in dotnet/runtime repo (using 7.x branch as per netcoredbg recommendation) * netcoredbg now depends (during runtime) on DbgShim which was moved to a separate repo (dotnet/diagnostic). We need to pass -p:UseDbgShimDependency=true in order to include it in a list of deps. * needed to enable selfContainedBuild for the managed part since it seems like it's the easiest way to force dotnet to copy relevant binaries to the out folder as well (like libdbgshim.so retrieved via the abovementioned nuget dependency) * use autoPatchelfHook to add stdenv.cc.cc.lib to binaries --- .../tools/misc/netcoredbg/arm64.patch | 26 +++++++++ .../tools/misc/netcoredbg/darwin.patch | 17 ++++++ .../tools/misc/netcoredbg/default.nix | 55 ++++++++++++------- .../tools/misc/netcoredbg/deps.nix | 13 +++++ .../tools/misc/netcoredbg/limits.patch | 12 ---- .../tools/misc/netcoredbg/update.sh | 37 +++++++++++++ 6 files changed, 127 insertions(+), 33 deletions(-) create mode 100644 pkgs/development/tools/misc/netcoredbg/arm64.patch create mode 100644 pkgs/development/tools/misc/netcoredbg/darwin.patch delete mode 100644 pkgs/development/tools/misc/netcoredbg/limits.patch create mode 100755 pkgs/development/tools/misc/netcoredbg/update.sh diff --git a/pkgs/development/tools/misc/netcoredbg/arm64.patch b/pkgs/development/tools/misc/netcoredbg/arm64.patch new file mode 100644 index 000000000000..ac057798c248 --- /dev/null +++ b/pkgs/development/tools/misc/netcoredbg/arm64.patch @@ -0,0 +1,26 @@ +diff --git a/platformdefinitions.cmake b/platformdefinitions.cmake +index ed3d9f6..6b0628f 100644 +--- a/platformdefinitions.cmake ++++ b/platformdefinitions.cmake +@@ -7,17 +7,21 @@ if (CLR_CMAKE_PLATFORM_ARCH_AMD64) + add_definitions(-DAMD64) + add_definitions(-DBIT64=1) # CoreClr <= 3.x + add_definitions(-DHOST_64BIT=1) # CoreClr > 3.x ++ add_definitions(-DHOST_AMD64) + elseif (CLR_CMAKE_PLATFORM_ARCH_I386) + add_definitions(-D_X86_) ++ add_definitions(-DHOST_X86) + elseif (CLR_CMAKE_PLATFORM_ARCH_ARM) + add_definitions(-D_ARM_) + add_definitions(-DARM) ++ add_definitions(-DHOST_ARM) + elseif (CLR_CMAKE_PLATFORM_ARCH_ARM64) + add_definitions(-D_ARM64_) + add_definitions(-DARM64) + add_definitions(-D_WIN64) + add_definitions(-DBIT64=1) # CoreClr <= 3.x + add_definitions(-DHOST_64BIT=1) # CoreClr > 3.x ++ add_definitions(-DHOST_ARM64) + else () + clr_unknown_arch() + endif () diff --git a/pkgs/development/tools/misc/netcoredbg/darwin.patch b/pkgs/development/tools/misc/netcoredbg/darwin.patch new file mode 100644 index 000000000000..ece3e51554f2 --- /dev/null +++ b/pkgs/development/tools/misc/netcoredbg/darwin.patch @@ -0,0 +1,17 @@ +diff --git a/detectplatform.cmake b/detectplatform.cmake +index 7b93bbf..6fa6e9e 100644 +--- a/detectplatform.cmake ++++ b/detectplatform.cmake +@@ -56,7 +56,11 @@ endif(CMAKE_SYSTEM_NAME STREQUAL Linux) + + if(CMAKE_SYSTEM_NAME STREQUAL Darwin) + set(CLR_CMAKE_PLATFORM_UNIX 1) +- set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) ++ if(CMAKE_SYSTEM_PROCESSOR STREQUAL arm64) ++ set(CLR_CMAKE_PLATFORM_UNIX_ARM64 1) ++ else() ++ set(CLR_CMAKE_PLATFORM_UNIX_AMD64 1) ++ endif() + set(CLR_CMAKE_PLATFORM_DARWIN 1) + if(CMAKE_VERSION VERSION_LESS "3.4.0") + set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} -o -c ") diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index 6ea15d74d8cf..e907bc5c4199 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -1,45 +1,44 @@ -{ lib, clangStdenv, stdenvNoCC, cmake, fetchFromGitHub, dotnetCorePackages, buildDotnetModule }: +{ lib, clangStdenv, stdenv, cmake, autoPatchelfHook, fetchFromGitHub, dotnetCorePackages, buildDotnetModule }: let pname = "netcoredbg"; - version = "2.0.0-895"; + version = "2.2.0-961"; + hash = "0gbjm8x40hzf787kccfxqb2wdgfks81f6hzr6rrmid42s4bfs5w7"; - # according to CMakeLists.txt, this should be 3.1 even when building for .NET 5 - coreclr-version = "3.1.19"; + coreclr-version = "release/7.0"; coreclr-src = fetchFromGitHub { owner = "dotnet"; - repo = "coreclr"; - rev = "v${coreclr-version}"; - sha256 = "o1KafmXqNjX9axr6sSxPKrfUX0e+b/4ANiVQt4T2ybw="; + repo = "runtime"; + rev = coreclr-version; + sha256 = "sha256-kBYb0Uw1IzDTpsEyd02/5sliVHoLmZdGnpybneV0u7U="; }; - dotnet-sdk = dotnetCorePackages.sdk_6_0; + dotnet-sdk = dotnetCorePackages.sdk_7_0; src = fetchFromGitHub { owner = "Samsung"; repo = pname; rev = version; - sha256 = "sha256-zOfChuNjD6py6KD1AmN5DgCGxD2YNH9gTyageoiN8PU="; + sha256 = hash; }; - unmanaged = clangStdenv.mkDerivation rec { + unmanaged = clangStdenv.mkDerivation { inherit src pname version; - patches = [ ./limits.patch ]; + # patch for arm from: https://github.com/Samsung/netcoredbg/pull/103#issuecomment-1446375535 + # needed until https://github.com/dotnet/runtime/issues/78286 is resolved + # patch for darwin from: https://github.com/Samsung/netcoredbg/pull/103#issuecomment-1446457522 + # needed until: ? + patches = [ ./arm64.patch ./darwin.patch ]; nativeBuildInputs = [ cmake dotnet-sdk ]; hardeningDisable = [ "strictoverflow" ]; preConfigure = '' export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 - dotnetVersion="$(${dotnet-sdk}/bin/dotnet --list-runtimes | grep -Po '^Microsoft.NETCore.App \K.*?(?= )')" - - cmakeFlagsArray+=( - "-DDBGSHIM_RUNTIME_DIR=${dotnet-sdk}/shared/Microsoft.NETCore.App/$dotnetVersion" - ) ''; cmakeFlags = [ - "-DCORECLR_DIR=${coreclr-src}" + "-DCORECLR_DIR=${coreclr-src}/src/coreclr" "-DDOTNET_DIR=${dotnet-sdk}" "-DBUILD_MANAGED=0" ]; @@ -51,21 +50,35 @@ let projectFile = "src/managed/ManagedPart.csproj"; nugetDeps = ./deps.nix; + # include platform-specific dbgshim binary in nugetDeps + dotnetFlags = [ "-p:UseDbgShimDependency=true" ]; executables = [ ]; + + # this passes RID down to dotnet build command + # and forces dotnet to include binary dependencies in the output (libdbgshim) + selfContainedBuild = true; }; in -stdenvNoCC.mkDerivation { +stdenv.mkDerivation rec { inherit pname version; + # managed brings external binaries (libdbgshim.*) + # include source here so that autoPatchelfHook can do it's job + src = managed; - buildCommand = '' + nativeBuildInputs = lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + buildInputs = lib.optionals stdenv.isLinux [ stdenv.cc.cc.lib ]; + installPhase = '' mkdir -p $out/share/netcoredbg $out/bin cp ${unmanaged}/* $out/share/netcoredbg - cp ${managed}/lib/netcoredbg/* $out/share/netcoredbg - ln -s $out/share/netcoredbg/netcoredbg $out/bin/netcoredbg + cp ./lib/netcoredbg/* $out/share/netcoredbg + # darwin won't work unless we link all files + ln -s $out/share/netcoredbg/* "$out/bin/" ''; passthru = { inherit (managed) fetch-deps; + + updateScript = [ ./update.sh pname version meta.homepage ]; }; meta = with lib; { diff --git a/pkgs/development/tools/misc/netcoredbg/deps.nix b/pkgs/development/tools/misc/netcoredbg/deps.nix index 8d311ab7f8bd..a073c98d5d43 100644 --- a/pkgs/development/tools/misc/netcoredbg/deps.nix +++ b/pkgs/development/tools/misc/netcoredbg/deps.nix @@ -8,6 +8,19 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "2.3.0"; sha256 = "121dhnfjd5jzm410dk79s8xk5jvd09xa0w5q3lbpqc7bs4wxmq4p"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "2.3.0"; sha256 = "11f11kvgrdgs86ykz4104jx1iw78v6af48hpdrhmr7y7h5334ziq"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.4.0"; sha256 = "1niyzqqfyhvh4zpxn8bcyyldynqlw0rfr1apwry4b3yrdnjh1hhh"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim"; version = "7.0.410101"; sha256 = "0az67ay2977gyksh039lamap2a7jcr4c8df4imqrdaqx1ksir993"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-arm"; version = "7.0.410101"; sha256 = "1x5iilp2436w2pjp9c29xwj6vlq4z43qhprz35yxvfzhg0vdsg0l"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-arm64"; version = "7.0.410101"; sha256 = "1zbrcr5iydbbyb48w2wksbckjgddd74z6xczcsb5b0gvyqra85sn"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-arm"; version = "7.0.410101"; sha256 = "179xp33f6aaaf775m673ij1zzrkfk7a07jmm7hcna9nb4ils04yg"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-arm64"; version = "7.0.410101"; sha256 = "0gjyw14ppwsy22c0f0ckxj6gan8gq8sk564bm762jgbvpj9w6br2"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-musl-x64"; version = "7.0.410101"; sha256 = "00yk3b7pygprgm53nlv9l6grrbykrv6dg27jmhw431dnv978wcqd"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.linux-x64"; version = "7.0.410101"; sha256 = "1k3182xh0a6fc8j5vspi0qx75has4gwydcr2hrbrapc2x850xq0z"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.osx-arm64"; version = "7.0.410101"; sha256 = "06mqqj2bpvqqaxh0hfa580m6db213zy349k0x8ah34whzp3bgphk"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.osx-x64"; version = "7.0.410101"; sha256 = "0yxlb8k935i0yc3cxl996bnk86b4qghlqmmjrv4s8mc5qai351ws"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-arm"; version = "7.0.410101"; sha256 = "10ad931l9vrz3sc4xjyndak8p3wi5gl92r37yp7smjx8ik09azma"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-arm64"; version = "7.0.410101"; sha256 = "1xd85r13qbk6awbrnp2q4a5vvcpwl7rw62s404rxrl4ghy2a43xz"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-x64"; version = "7.0.410101"; sha256 = "1zlamjlv1s4d40sf08bbr6c7157lgchcla9x2g911ac0mnh8qqbf"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.DbgShim.win-x86"; version = "7.0.410101"; sha256 = "0sk3akxgb1vw03fkj59m3n90j6v0a5g4px83h2llda8p5q729zbr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) diff --git a/pkgs/development/tools/misc/netcoredbg/limits.patch b/pkgs/development/tools/misc/netcoredbg/limits.patch deleted file mode 100644 index 8a2dcced32c5..000000000000 --- a/pkgs/development/tools/misc/netcoredbg/limits.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/debugger/frames.cpp b/src/debugger/frames.cpp -index 534936b..21366f9 100644 ---- a/src/debugger/frames.cpp -+++ b/src/debugger/frames.cpp -@@ -9,6 +9,7 @@ - #include "utils/platform.h" - #include "utils/logger.h" - #include "utils/torelease.h" -+#include - - namespace netcoredbg - { diff --git a/pkgs/development/tools/misc/netcoredbg/update.sh b/pkgs/development/tools/misc/netcoredbg/update.sh new file mode 100755 index 000000000000..a4dbb8f0291d --- /dev/null +++ b/pkgs/development/tools/misc/netcoredbg/update.sh @@ -0,0 +1,37 @@ +#! /usr/bin/env nix-shell +#! nix-shell -I nixpkgs=./. -i bash -p common-updater-scripts +# shellcheck shell=bash + +set -euo pipefail + +pname=$1 +old_version=$2 +url=$3 + +cd "$(dirname "${BASH_SOURCE[0]}")" + +deps_file="$(realpath "./deps.nix")" + +new_version="$(list-git-tags --url="$url" | sort --reverse --numeric-sort | head -n 1)" + +if [[ "$new_version" == "$old_version" ]]; then + echo "Already up to date!" + exit 0 +fi + +updateVersion() { + sed -i "s/version = \"$old_version\";/version = \"$new_version\";/g" default.nix +} + +updateHash() { + hashKey="hash" + hash=$(nix-prefetch-url --unpack --type sha256 "$url/archive/$new_version.tar.gz") + sed -i "s|$hashKey = \"[a-zA-Z0-9\/+-=]*\";|$hashKey = \"$hash\";|g" default.nix +} + +updateVersion +updateHash + +cd ../../../../../ + +$(nix-build -A "$pname".fetch-deps --no-out-link) "$deps_file" From c0a2b57e200e41f4b33af9e2f14a4b861c88811d Mon Sep 17 00:00:00 2001 From: Konrad Malik Date: Sun, 26 Feb 2023 15:11:23 +0100 Subject: [PATCH 058/174] maintainers: add konradmalik --- maintainers/maintainer-list.nix | 7 +++++++ pkgs/development/tools/misc/netcoredbg/default.nix | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f290812bf47d..eb8e3f7ea4e4 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8019,6 +8019,13 @@ githubId = 15692230; name = "Muhammad Herdiansyah"; }; + konradmalik = { + email = "konrad.malik@gmail.com"; + matrix = "@konradmalik:matrix.org"; + name = "Konrad Malik"; + github = "konradmalik"; + githubId = 13033392; + }; koozz = { email = "koozz@linux.com"; github = "koozz"; diff --git a/pkgs/development/tools/misc/netcoredbg/default.nix b/pkgs/development/tools/misc/netcoredbg/default.nix index e907bc5c4199..d4a167b75111 100644 --- a/pkgs/development/tools/misc/netcoredbg/default.nix +++ b/pkgs/development/tools/misc/netcoredbg/default.nix @@ -86,6 +86,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/Samsung/netcoredbg"; license = licenses.mit; platforms = platforms.unix; - maintainers = [ maintainers.leo60228 ]; + maintainers = with maintainers; [ leo60228 konradmalik ]; }; } From 3032954df3660ea74c72e69b42ecb97606c290ad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 13:09:03 +0100 Subject: [PATCH 059/174] python310Packages.snapcast: 2.3.1 -> 2.3.2 --- pkgs/development/python-modules/snapcast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snapcast/default.nix b/pkgs/development/python-modules/snapcast/default.nix index 2588c5724996..0ffcbdb135c9 100644 --- a/pkgs/development/python-modules/snapcast/default.nix +++ b/pkgs/development/python-modules/snapcast/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "snapcast"; - version = "2.3.1"; + version = "2.3.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "happyleavesaoc"; repo = "python-snapcast"; rev = "refs/tags/${version}"; - hash = "sha256-5SnjAkIrsgyEQ9nrBfe1jL+y4cxFzRVao2PM3VPIz8c="; + hash = "sha256-kUUKDcHnWA+saqQM7aCfW9NmhG6DYsB21tlEQ3cYNs4="; }; propagatedBuildInputs = [ From 23e0077d3653757c405a848d07ddbd37507a7ece Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 14:27:47 +0100 Subject: [PATCH 060/174] fizz: 2023.02.27.00 -> 2023.03.06.00 --- pkgs/development/libraries/fizz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/fizz/default.nix b/pkgs/development/libraries/fizz/default.nix index 6ab107497fda..c933dc35f218 100644 --- a/pkgs/development/libraries/fizz/default.nix +++ b/pkgs/development/libraries/fizz/default.nix @@ -19,12 +19,12 @@ stdenv.mkDerivation rec { pname = "fizz"; - version = "2023.02.27.00"; + version = "2023.03.06.00"; src = fetchFromGitHub { owner = "facebookincubator"; repo = "fizz"; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-zb3O5YHQc+1cPcL0K3FwhMfr+/KFQU7SDVT1bEITF6E="; }; From 0ba1c25b620047a8c05cccce308fcb76c25c1780 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 14:04:00 +0000 Subject: [PATCH 061/174] python310Packages.hvac: 1.0.2 -> 1.1.0 --- pkgs/development/python-modules/hvac/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 9cbc361c1da6..4945470b2882 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "hvac"; - version = "1.0.2"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-5AKMXA7Me3/PalTSkPmSQOWrzbn/5ELRwU8GExDUxhw="; + sha256 = "sha256-B53KWIVt7mZG7VovIoOAnBbS3u3eHp6WFbKRAySkuWk="; }; propagatedBuildInputs = [ From 04a5d95dbf13ed3776edc7c24927cf76975f37aa Mon Sep 17 00:00:00 2001 From: milran Date: Tue, 31 Jan 2023 16:15:27 +0900 Subject: [PATCH 062/174] maintainers: add milran Signed-off-by: milran --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index f67493a332dd..31d92afe5fa5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9620,6 +9620,12 @@ githubId = 5378535; name = "Milo Gertjejansen"; }; + milran = { + email = "milranmike@protonmail.com"; + github = "milran"; + githubId = 93639059; + name = "Milran Mike"; + }; mimame = { email = "miguel.madrid.mencia@gmail.com"; github = "mimame"; From 42cda97c500b54ad2e8617d515cc198a027dceaa Mon Sep 17 00:00:00 2001 From: milran Date: Tue, 31 Jan 2023 15:05:30 +0900 Subject: [PATCH 063/174] gqlgenc: init at 0.11.3 Signed-off-by: milran --- pkgs/development/tools/gqlgenc/default.nix | 24 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/tools/gqlgenc/default.nix diff --git a/pkgs/development/tools/gqlgenc/default.nix b/pkgs/development/tools/gqlgenc/default.nix new file mode 100644 index 000000000000..4f81b849a9ef --- /dev/null +++ b/pkgs/development/tools/gqlgenc/default.nix @@ -0,0 +1,24 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "gqlgenc"; + version = "0.11.3"; + + src = fetchFromGitHub { + owner = "yamashou"; + repo = "gqlgenc"; + rev = "v${version}"; + sha256 = "sha256-yMM6LR5Zviwr1OduSUxsSzdzrb+Lv5ILkVjXWD0b0FU="; + }; + + excludedPackages = [ "example" ]; + + vendorHash = "sha256-d95w9cApLyYu+OOP4UM5/+4DDU2LqyHU8E3wSTW8c7Q="; + + meta = with lib; { + description = "Go tool for building GraphQL client with gqlgen"; + homepage = "https://github.com/Yamashou/gqlgenc"; + license = licenses.mit; + maintainers = with maintainers; [ milran ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e49545db3510..66a90561c3d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26283,6 +26283,8 @@ with pkgs; gotestsum = callPackage ../development/tools/gotestsum { }; + gqlgenc = callPackage ../development/tools/gqlgenc { }; + impl = callPackage ../development/tools/impl { }; moq = callPackage ../development/tools/moq { }; From 19f0a78c195223e7021ff4d16bad71c6f4cb981d Mon Sep 17 00:00:00 2001 From: apfelkuchen06 Date: Tue, 7 Mar 2023 01:53:20 +0100 Subject: [PATCH 064/174] mpvScripts.uosc: init at 4.6.0 --- pkgs/applications/video/mpv/scripts/uosc.nix | 48 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/applications/video/mpv/scripts/uosc.nix diff --git a/pkgs/applications/video/mpv/scripts/uosc.nix b/pkgs/applications/video/mpv/scripts/uosc.nix new file mode 100644 index 000000000000..1a486dbf556d --- /dev/null +++ b/pkgs/applications/video/mpv/scripts/uosc.nix @@ -0,0 +1,48 @@ +{ stdenvNoCC, lib, fetchFromGitHub, makeFontsConf }: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "uosc"; + version = "4.6.0"; + + src = fetchFromGitHub { + owner = "tomasklaen"; + repo = "uosc"; + rev = finalAttrs.version; + hash = "sha256-AxApKlSaRLPl6VsXsARfaT3kWDK6AB2AAEmIHYiuFaM="; + }; + + postPatch = '' + substituteInPlace scripts/uosc.lua \ + --replace "mp.find_config_file('scripts')" "\"$out/share/mpv/scripts\"" + ''; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p $out/share/mpv/ + cp -r scripts $out/share/mpv + cp -r fonts $out/share + + runHook postInstall + ''; + + passthru.scriptName = "uosc.lua"; + # the script uses custom "texture" fonts as the background for ui elements. + # In order for mpv to find them, we need to adjust the fontconfig search path. + passthru.extraWrapperArgs = [ + "--set" + "FONTCONFIG_FILE" + (toString (makeFontsConf { + fontDirectories = [ "${finalAttrs.finalPackage}/share/fonts" ]; + })) + ]; + + meta = with lib; { + description = "Feature-rich minimalist proximity-based UI for MPV player"; + homepage = "https://github.com/tomasklaen/uosc"; + license = licenses.gpl3Only; + maintainers = with lib.maintainers; [ apfelkuchen6 ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04074f2a09e7..f6324c453e68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31765,6 +31765,7 @@ with pkgs; simple-mpv-webui = callPackage ../applications/video/mpv/scripts/simple-mpv-webui.nix {}; sponsorblock = callPackage ../applications/video/mpv/scripts/sponsorblock.nix {}; thumbnail = callPackage ../applications/video/mpv/scripts/thumbnail.nix { }; + uosc = callPackage ../applications/video/mpv/scripts/uosc.nix { }; vr-reversal = callPackage ../applications/video/mpv/scripts/vr-reversal.nix {}; webtorrent-mpv-hook = callPackage ../applications/video/mpv/scripts/webtorrent-mpv-hook.nix { }; youtube-quality = callPackage ../applications/video/mpv/scripts/youtube-quality.nix { }; From 2768866261ee21659edc6427f66d5b5b0f613752 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 7 Mar 2023 23:16:33 +0800 Subject: [PATCH 065/174] nixosTests.pantheon: ensure the password box is focused when login Sometimes it is not focused for some reasons. --- nixos/tests/pantheon.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/pantheon.nix b/nixos/tests/pantheon.nix index 0773fc0472aa..0b920c7a6d5f 100644 --- a/nixos/tests/pantheon.nix +++ b/nixos/tests/pantheon.nix @@ -15,6 +15,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : services.xserver.enable = true; services.xserver.desktopManager.pantheon.enable = true; + environment.systemPackages = [ pkgs.xdotool ]; }; enableOCR = true; @@ -29,6 +30,10 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : machine.wait_for_text("${user.description}") # OCR was struggling with this one. # machine.wait_for_text("${bob.description}") + # Ensure the password box is focused by clicking it. + # Workaround for https://github.com/NixOS/nixpkgs/issues/211366. + machine.succeed("XAUTHORITY=/var/lib/lightdm/.Xauthority DISPLAY=:0 xdotool mousemove 512 505 click 1") + machine.sleep(2) machine.screenshot("elementary_greeter_lightdm") with subtest("Login with elementary-greeter"): From 94ce5a875a001d285537a8757fd6e63d6b3f93f3 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 7 Mar 2023 17:58:12 +0200 Subject: [PATCH 066/174] pkgs/tools/wayland: enable strictDeps `fd "\.nix" pkgs/tools/wayland | xargs rg "strictDeps" --files-without-match | xargs rg "buildRust|buildGo|buildPyt|buildNim" --files-without-match | xargs vim -p` checked with Artturin/diffing removed unnecessary depsBuildBuild in waynergy --- pkgs/tools/wayland/mpvpaper/default.nix | 3 +++ pkgs/tools/wayland/proycon-wayout/default.nix | 1 + pkgs/tools/wayland/sov/default.nix | 2 ++ pkgs/tools/wayland/waynergy/default.nix | 4 ++-- pkgs/tools/wayland/wev/default.nix | 1 + pkgs/tools/wayland/wlprop/default.nix | 4 +++- 6 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/tools/wayland/mpvpaper/default.nix index 76598f4afea2..3f98e8ef8c21 100644 --- a/pkgs/tools/wayland/mpvpaper/default.nix +++ b/pkgs/tools/wayland/mpvpaper/default.nix @@ -6,6 +6,7 @@ , wlroots , wayland , wayland-protocols +, wayland-scanner , egl-wayland , glew-egl , mpv @@ -26,12 +27,14 @@ stdenv.mkDerivation rec { sha256 = "sha256-0LjIwOY2hBUb0nziD3HLP2Ek5+8v3ntssRFD9eQgWkc="; }; + strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config makeWrapper installShellFiles + wayland-scanner ]; buildInputs = [ diff --git a/pkgs/tools/wayland/proycon-wayout/default.nix b/pkgs/tools/wayland/proycon-wayout/default.nix index 2b4dc0f54e4f..265d585ce1df 100644 --- a/pkgs/tools/wayland/proycon-wayout/default.nix +++ b/pkgs/tools/wayland/proycon-wayout/default.nix @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { mv $out/bin/wayout $out/bin/proycon-wayout # Avoid conflict with shinyzenith/wayout ''; + strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ scdoc ninja meson cmake pkg-config wayland-scanner ]; buildInputs = [ wayland-protocols wayland cairo pango ]; diff --git a/pkgs/tools/wayland/sov/default.nix b/pkgs/tools/wayland/sov/default.nix index b9b139c7a1f9..d7415a5fa517 100644 --- a/pkgs/tools/wayland/sov/default.nix +++ b/pkgs/tools/wayland/sov/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace src/sov/main.c --replace '/usr' $out ''; + + strictDeps = true; nativeBuildInputs = [ meson pkg-config wayland-scanner ninja ]; buildInputs = [ wayland wayland-protocols freetype ]; diff --git a/pkgs/tools/wayland/waynergy/default.nix b/pkgs/tools/wayland/waynergy/default.nix index fce7ac6605af..83de408554db 100644 --- a/pkgs/tools/wayland/waynergy/default.nix +++ b/pkgs/tools/wayland/waynergy/default.nix @@ -24,8 +24,8 @@ stdenv.mkDerivation rec { hash = "sha256-pk1U3svy9r7O9ivFjBNXsaOmgc+nv2QTuwwHejB7B4Q="; }; - depsBuildBuild = [ pkg-config ]; - nativeBuildInputs = [ meson ninja ]; + strictDeps = true; + nativeBuildInputs = [ pkg-config meson ninja wayland-scanner ]; buildInputs = [ libdrm wayland wayland-protocols wl-clipboard libxkbcommon libressl ]; postPatch = '' diff --git a/pkgs/tools/wayland/wev/default.nix b/pkgs/tools/wayland/wev/default.nix index e450de2f2dcf..506b67d14e5b 100644 --- a/pkgs/tools/wayland/wev/default.nix +++ b/pkgs/tools/wayland/wev/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation rec { sha256 = "0l71v3fzgiiv6xkk365q1l08qvaymxd4kpaya6r2g8yzkr7i2hms"; }; + strictDeps = true; # for scdoc depsBuildBuild = [ pkg-config diff --git a/pkgs/tools/wayland/wlprop/default.nix b/pkgs/tools/wayland/wlprop/default.nix index 82f80a594ad0..67c4918b371f 100644 --- a/pkgs/tools/wayland/wlprop/default.nix +++ b/pkgs/tools/wayland/wlprop/default.nix @@ -1,4 +1,4 @@ -{ fetchgit, gawk, jq, lib, makeWrapper, slurp, stdenv, sway }: +{ fetchgit, gawk, jq, lib, makeWrapper, slurp, stdenv, sway, bash }: stdenv.mkDerivation rec { pname = "wlprop"; @@ -10,7 +10,9 @@ stdenv.mkDerivation rec { sha256 = "sha256-ZJ9LYYrU2cNYikiVNTlEcI4QXcoqfl7iwk3Be+NhGG8="; }; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; dontBuild = true; installPhase = '' From 47ace7b0af442b2e6bdb8728330622c7dbc81499 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 7 Mar 2023 18:13:44 +0200 Subject: [PATCH 067/174] pkgs/tools/nix: enable strictDeps `fd "\.nix" pkgs/tools/nix | xargs rg "strictDeps" --files-without-match | xargs rg "buildRust|buildGo|buildPyt|buildNim" --files-without-match | xargs vim -p` checked with Artturin/diffing --- pkgs/tools/nix/dnadd/default.nix | 1 + pkgs/tools/nix/info/default.nix | 4 +++- pkgs/tools/nix/nix-script/default.nix | 3 ++- pkgs/tools/nix/nixos-generators/default.nix | 4 +++- pkgs/tools/nix/nixos-option/default.nix | 1 + 5 files changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/nix/dnadd/default.nix b/pkgs/tools/nix/dnadd/default.nix index 3f4d76a9c4d4..59a0516629e1 100644 --- a/pkgs/tools/nix/dnadd/default.nix +++ b/pkgs/tools/nix/dnadd/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1vzbgz8y9gj4lszsx4iczfbrj373sl4wi43j7rp46zfcbw323d4r"; }; + strictDeps = true; makeFlags = [ "PREFIX=$(out)" ]; meta = with lib; { diff --git a/pkgs/tools/nix/info/default.nix b/pkgs/tools/nix/info/default.nix index 84bd3e891622..73c336afe045 100644 --- a/pkgs/tools/nix/info/default.nix +++ b/pkgs/tools/nix/info/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, coreutils, findutils, gnugrep, darwin +{ stdenv, lib, coreutils, findutils, gnugrep, darwin, bash # Avoid having GHC in the build-time closure of all NixOS configurations , doCheck ? false, shellcheck }: @@ -26,7 +26,9 @@ stdenv.mkDerivation { ''; inherit doCheck; + strictDeps = true; nativeCheckInputs = [ shellcheck ]; + buildInputs = [ bash ]; checkPhase = '' shellcheck ./nix-info diff --git a/pkgs/tools/nix/nix-script/default.nix b/pkgs/tools/nix/nix-script/default.nix index f9077ef13871..c83bfbc7a226 100644 --- a/pkgs/tools/nix/nix-script/default.nix +++ b/pkgs/tools/nix/nix-script/default.nix @@ -11,7 +11,8 @@ stdenv.mkDerivation { sha256 = "0yiqljamcj9x8z801bwj7r30sskrwv4rm6sdf39j83jqql1fyq7y"; }; - buildInputs = [ + strictDeps = true; + nativeBuildInputs = [ (haskellPackages.ghcWithPackages (hs: with hs; [ posix-escape ])) ]; diff --git a/pkgs/tools/nix/nixos-generators/default.nix b/pkgs/tools/nix/nixos-generators/default.nix index fa4495647c6e..bf3a387c439f 100644 --- a/pkgs/tools/nix/nixos-generators/default.nix +++ b/pkgs/tools/nix/nixos-generators/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix }: +{ stdenv, lib, fetchFromGitHub, makeWrapper, coreutils, jq, findutils, nix, bash }: stdenv.mkDerivation rec { pname = "nixos-generators"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { rev = version; sha256 = "sha256-WecDwDY/hEcDQYzFnccCNa+5Umht0lfjx/d1qGDy/rQ="; }; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; installFlags = [ "PREFIX=$(out)" ]; postFixup = '' wrapProgram $out/bin/nixos-generate \ diff --git a/pkgs/tools/nix/nixos-option/default.nix b/pkgs/tools/nix/nixos-option/default.nix index 9137e5a716c5..a9cc967d7680 100644 --- a/pkgs/tools/nix/nixos-option/default.nix +++ b/pkgs/tools/nix/nixos-option/default.nix @@ -3,6 +3,7 @@ stdenv.mkDerivation rec { name = "nixos-option"; src = ./.; + strictDeps = true; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost nix ]; meta = with lib; { From 2f430da1c6aaeb4306427b77f139f53dcd729e08 Mon Sep 17 00:00:00 2001 From: Nathan Viets Date: Thu, 2 Mar 2023 19:37:27 -0500 Subject: [PATCH 068/174] Replacing MRAN mirror with posit --- pkgs/development/r-modules/default.nix | 4 ++-- pkgs/development/r-modules/generate-r-packages.R | 6 ++++-- pkgs/development/r-modules/generate-shell.nix | 1 + 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/r-modules/default.nix b/pkgs/development/r-modules/default.nix index 7cfb8e54f275..6d6814e3f66a 100644 --- a/pkgs/development/r-modules/default.nix +++ b/pkgs/development/r-modules/default.nix @@ -68,9 +68,9 @@ let hydraPlatforms = []; }; deriveCran = mkDerive { - mkHomepage = {name, snapshot, ...}: "http://mran.revolutionanalytics.com/snapshot/${snapshot}/web/packages/${name}/"; + mkHomepage = {name, snapshot, ...}: "https://cran.r-project.org/${snapshot}/web/packages/${name}/"; mkUrls = {name, version, snapshot}: [ - "http://mran.revolutionanalytics.com/snapshot/${snapshot}/src/contrib/${name}_${version}.tar.gz" + "https://packagemanager.rstudio.com/cran/${snapshot}/src/contrib/${name}_${version}.tar.gz" ]; }; diff --git a/pkgs/development/r-modules/generate-r-packages.R b/pkgs/development/r-modules/generate-r-packages.R index 8c97c651e4c4..0b01c09a278e 100755 --- a/pkgs/development/r-modules/generate-r-packages.R +++ b/pkgs/development/r-modules/generate-r-packages.R @@ -1,5 +1,6 @@ #!/usr/bin/env Rscript library(data.table) +library(jsonlite) library(parallel) library(BiocManager) cl <- makeCluster(10) @@ -11,12 +12,13 @@ if ("release" %in% biocVersion$BiocStatus) { } else { biocVersion <- max(as.numeric(as.character(biocVersion$Bioc))) } -snapshotDate <- Sys.Date()-1 +dates <- stream_in(url("https://packagemanager.rstudio.com/__api__/repos/2/transaction-dates"), verbose = FALSE) +snapshotDate <- as.Date(dates[nrow(dates), "alias"]) mirrorUrls <- list( bioc=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/bioc/src/contrib/") , "bioc-annotation"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/data/annotation/src/contrib/") , "bioc-experiment"=paste0("http://bioconductor.statistik.tu-dortmund.de/packages/", biocVersion, "/data/experiment/src/contrib/") - , cran=paste0("http://mran.revolutionanalytics.com/snapshot/", snapshotDate, "/src/contrib/") + , cran=paste0("https://packagemanager.rstudio.com/cran/", snapshotDate, "/src/contrib/") ) mirrorType <- commandArgs(trailingOnly=TRUE)[1] diff --git a/pkgs/development/r-modules/generate-shell.nix b/pkgs/development/r-modules/generate-shell.nix index 1c96cf05cb54..0ab3d6fb557f 100644 --- a/pkgs/development/r-modules/generate-shell.nix +++ b/pkgs/development/r-modules/generate-shell.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation { (rWrapper.override { packages = with rPackages; [ data_table + jsonlite parallel BiocManager ]; From 25939765180ed716662ed2c441ebe2506202cd8b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 18:51:37 +0000 Subject: [PATCH 069/174] csdr: 0.18.0 -> 0.18.1 --- pkgs/applications/radio/csdr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/radio/csdr/default.nix b/pkgs/applications/radio/csdr/default.nix index b26e8ae7225f..5f130c26658b 100644 --- a/pkgs/applications/radio/csdr/default.nix +++ b/pkgs/applications/radio/csdr/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "csdr"; - version = "0.18.0"; + version = "0.18.1"; src = fetchFromGitHub { owner = "jketterl"; repo = pname; rev = version; - sha256 = "sha256-4XO3QYF0yaMNFjBHulrlZvO0/A1fFscD98QxnC6Itmk="; + sha256 = "sha256-Cmms+kQzTP+CMDRXCbtWuizosFe9FywLobjBOUA79O0="; }; nativeBuildInputs = [ From 7e1bcf5f38a361828604e68efc98825ee0e060c2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 19:09:54 +0000 Subject: [PATCH 070/174] glooctl: 1.13.8 -> 1.13.9 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index 6f54aba1f0fd..0a3069572621 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.8"; + version = "1.13.9"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-mflLB+fdNgOlxq/Y2muIyNZHZPFhL6Px355l9w54zC4="; + hash = "sha256-rlZtZC5D5wSYVjP/IHSY9eSfaGRGhtfndkC6PYDMXqg="; }; subPackages = [ "projects/gloo/cli/cmd" ]; From 0c370aab6450244197fcd08814a42cdf560ea973 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 19:23:02 +0000 Subject: [PATCH 071/174] aws-sso-cli: 1.9.9 -> 1.9.10 --- pkgs/tools/admin/aws-sso-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-sso-cli/default.nix b/pkgs/tools/admin/aws-sso-cli/default.nix index 023a91df8332..25fd3b311ab5 100644 --- a/pkgs/tools/admin/aws-sso-cli/default.nix +++ b/pkgs/tools/admin/aws-sso-cli/default.nix @@ -6,15 +6,15 @@ }: buildGoModule rec { pname = "aws-sso-cli"; - version = "1.9.9"; + version = "1.9.10"; src = fetchFromGitHub { owner = "synfinatic"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ulnRVyfJ0L1iJ3zVvn3VUYGXDV/UwhqdcC8D4wnjNys="; + sha256 = "sha256-hDXCH5B4bc0SKv/qzk92bPm366LmdYWTuVVn8KI0avo="; }; - vendorSha256 = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI="; + vendorHash = "sha256-myjHRZXTjsLXD8kibcdf1/Nhvx50fDsFtmZd63DpiiI="; nativeBuildInputs = [ makeWrapper ]; From 937e716d4ea11874fdd6381ced8a93f42f4d7273 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 7 Mar 2023 20:22:05 +0100 Subject: [PATCH 072/174] python3Packages.sphinxext-opengraph: 0.7.5 -> 0.8.1 https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/V0.8.0 https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/v0.8.1 --- .../python-modules/sphinxext-opengraph/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 4bf290328821..5058fc82ff88 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , sphinx +, matplotlib , pytestCheckHook , beautifulsoup4 , setuptools-scm @@ -9,13 +10,13 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; - version = "0.7.5"; + version = "0.8.1"; src = fetchFromGitHub { owner = "wpilibsuite"; repo = "sphinxext-opengraph"; rev = "refs/tags/v${version}"; - hash = "sha256-fNtXj7iYX7rSaGO6JcxC+PvR8WzTFl8gYwHyRExYdfI="; + hash = "sha256-3q/OKkLtyA1Dw2PfTT4Fmzyn5qPbjprekpE7ItnFNUo="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -26,6 +27,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ sphinx + matplotlib ]; nativeCheckInputs = [ From 8460c8b124a00c603ccf1786e1a7d19d58874790 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Tue, 7 Mar 2023 21:50:08 +0200 Subject: [PATCH 073/174] tlaps: migrate to OCaml 4.14 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 387c96dd3d05..e4c04e33ef00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -37256,7 +37256,7 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; tlaps = callPackage ../applications/science/logic/tlaplus/tlaps.nix { - inherit (ocaml-ng.ocamlPackages_4_05) ocaml; + inherit (ocaml-ng.ocamlPackages_4_14_unsafe_string) ocaml; }; tlaplusToolbox = callPackage ../applications/science/logic/tlaplus/toolbox.nix {}; From 0a11517a84f5eab2e7d4ef5219325f20cc52653f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Mar 2023 19:52:26 +0000 Subject: [PATCH 074/174] act: 0.2.42 -> 0.2.43 --- pkgs/development/tools/misc/act/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/act/default.nix b/pkgs/development/tools/misc/act/default.nix index a8fd24ebd6a3..da9a7f4db6da 100644 --- a/pkgs/development/tools/misc/act/default.nix +++ b/pkgs/development/tools/misc/act/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "act"; - version = "0.2.42"; + version = "0.2.43"; src = fetchFromGitHub { owner = "nektos"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+1ciEHBMl78aFDu/NzIAdsGtAZJOfHZRDDZCR1+YuEM="; + hash = "sha256-Le5jw1ezGNx4lurHucbJ+q9arXldnHjDlAO61w4p61U="; }; - vendorHash = "sha256-qXjDeR0VZyyhASpt6zv6OyltEZDoguILhhD1ejpd0F4="; + vendorHash = "sha256-yQA84lBe85/NyG6GUa9gueLKw7Ei+3Hc3U9PmqGG8YA="; doCheck = false; From 5e6ebb3e898d5dfee032464e54995f2fcb60bdbb Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 21:41:19 +0100 Subject: [PATCH 075/174] python310Packages.aiolivisi: 0.0.16 -> 0.0.18 Changelog: https://github.com/StefanIacobLivisi/aiolivisi/releases/tag/0.0.18 --- pkgs/development/python-modules/aiolivisi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix index 1f0c21a208f9..f5a24b0a6c8a 100644 --- a/pkgs/development/python-modules/aiolivisi/default.nix +++ b/pkgs/development/python-modules/aiolivisi/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "aiolivisi"; - version = "0.0.16"; + version = "0.0.18"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-L7KeTdC3IPbXBLDkP86CyQ59s2bL4byxgKhl8YCmZHQ="; + hash = "sha256-8Cy2hhYrUBRfVb2hgil6Irk+iTJmJ8JL+5wvm4rm7kM="; }; postPatch = '' From 8312cc0a1f951b8c656b5e8f93578c57e6932045 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 21:50:21 +0100 Subject: [PATCH 076/174] python310Packages.pyobihai: 1.3.2 -> 1.4.0 --- pkgs/development/python-modules/pyobihai/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyobihai/default.nix b/pkgs/development/python-modules/pyobihai/default.nix index 0cc62311f329..45f12b49b96f 100644 --- a/pkgs/development/python-modules/pyobihai/default.nix +++ b/pkgs/development/python-modules/pyobihai/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, defusedxml , fetchPypi , pythonOlder , requests @@ -7,7 +8,7 @@ buildPythonPackage rec { pname = "pyobihai"; - version = "1.3.2"; + version = "1.4.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,10 +16,11 @@ buildPythonPackage rec { # GitHub release, https://github.com/dshokouhi/pyobihai/issues/10 src = fetchPypi { inherit pname version; - hash = "sha256-zhsnJyhXlugK0nJ7FJZZcrq2VDQt1a9uCgsJAIABZ28="; + hash = "sha256-P6tKpssey59SdjS/QWpuv1UUagjR7RVAl6rse/O79mg="; }; propagatedBuildInputs = [ + defusedxml requests ]; From 9f031004e71fe8cfa4ae1095a50a3afd8cdfe3d5 Mon Sep 17 00:00:00 2001 From: Artturin Date: Tue, 7 Mar 2023 22:54:03 +0200 Subject: [PATCH 077/174] libdisplay-info: 0.1.0 -> 0.1.1 fixes the pkg-config pc filename https://gitlab.freedesktop.org/emersion/libdisplay-info/-/commit/d0ad02c6405ffb892d2afd4368db5cf1d322f7d2 --- pkgs/development/libraries/libdisplay-info/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libdisplay-info/default.nix b/pkgs/development/libraries/libdisplay-info/default.nix index fa499a001464..3e29f621cb04 100644 --- a/pkgs/development/libraries/libdisplay-info/default.nix +++ b/pkgs/development/libraries/libdisplay-info/default.nix @@ -11,14 +11,14 @@ stdenv.mkDerivation rec { pname = "libdisplay-info"; - version = "0.1.0"; + version = "0.1.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "emersion"; repo = pname; rev = version; - sha256 = "sha256-jfi7RpEtyQicW0WWhrQg28Fta60YWxTbpbmPHmXxDhw="; + sha256 = "sha256-7t1CoLus3rPba9paapM7+H3qpdsw7FlzJsSHFwM/2Lk="; }; nativeBuildInputs = [ meson pkg-config ninja edid-decode python3 ]; From 337384d81cc6e47326062cd619445325c756f69b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 21:58:50 +0100 Subject: [PATCH 078/174] python310Packages.hvac: add changelog to meta --- pkgs/development/python-modules/hvac/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 4945470b2882..9e513b66a6fb 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-B53KWIVt7mZG7VovIoOAnBbS3u3eHp6WFbKRAySkuWk="; + hash = "sha256-B53KWIVt7mZG7VovIoOAnBbS3u3eHp6WFbKRAySkuWk="; }; propagatedBuildInputs = [ @@ -29,6 +29,7 @@ buildPythonPackage rec { meta = with lib; { description = "HashiCorp Vault API client"; homepage = "https://github.com/ianunruh/hvac"; + changelog = "https://github.com/hvac/hvac/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; From 94ab7a2363f730e8fcd92387154ccebcb21b1410 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:00:56 +0100 Subject: [PATCH 079/174] python310Packages.hvac: disable on unsupported Python releases --- pkgs/development/python-modules/hvac/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/hvac/default.nix b/pkgs/development/python-modules/hvac/default.nix index 9e513b66a6fb..a9da2ef29ca3 100644 --- a/pkgs/development/python-modules/hvac/default.nix +++ b/pkgs/development/python-modules/hvac/default.nix @@ -4,11 +4,15 @@ , pyhcl , requests , six +, pythonOlder }: buildPythonPackage rec { pname = "hvac"; version = "1.1.0"; + format = "setuptools"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; From c0fb30a60e8d2a4de18c0ce53ea6cc8d05f796c9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:04:24 +0100 Subject: [PATCH 080/174] python310Packages.archinfo: 9.2.40 -> 9.2.41 --- pkgs/development/python-modules/archinfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/archinfo/default.nix b/pkgs/development/python-modules/archinfo/default.nix index e88d0bb2e9b7..9042269a465c 100644 --- a/pkgs/development/python-modules/archinfo/default.nix +++ b/pkgs/development/python-modules/archinfo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.2.40"; + version = "9.2.41"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-jJFOtvcsU1bmJQT7atE6DJLcAeoN+78yWP4OiM6euWI="; + hash = "sha256-O2Tj5rwev5tWnaHq/GJV5/9fAlk5np7S3Yw+ehmofks="; }; nativeBuildInputs = [ From 263f871a627224db5af69ea1e93ef8e76cf577e7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:04:28 +0100 Subject: [PATCH 081/174] python310Packages.ailment: 9.2.40 -> 9.2.41 --- pkgs/development/python-modules/ailment/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ailment/default.nix b/pkgs/development/python-modules/ailment/default.nix index 17e9afe40409..0bcd1360e290 100644 --- a/pkgs/development/python-modules/ailment/default.nix +++ b/pkgs/development/python-modules/ailment/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.2.40"; + version = "9.2.41"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-Ykm9LuhICsnJemcAMlS0ohZM7x1ndCjF6etX9ip2IsA="; + hash = "sha256-KXbHD0CsQotHjc/Pbo4/y/uhCvGkbPDGn1BF8A68xBY="; }; nativeBuildInputs = [ From 8318c658b973ddad416400fa435df09e9a42202f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:04:31 +0100 Subject: [PATCH 082/174] python310Packages.pyvex: 9.2.40 -> 9.2.41 --- pkgs/development/python-modules/pyvex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyvex/default.nix b/pkgs/development/python-modules/pyvex/default.nix index 628e01dde909..2b4afb7802c2 100644 --- a/pkgs/development/python-modules/pyvex/default.nix +++ b/pkgs/development/python-modules/pyvex/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.2.40"; + version = "9.2.41"; format = "pyproject"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-M4eo/ADLoisxl2VFbLN2/VUV8vpDOxP+T6r5STDtyaA="; + hash = "sha256-NYNxuWvAvx5IW1gdWv+EF321yzUPaqFBRNKVwu4ogug="; }; nativeBuildInputs = [ From dd974c57ac8a0053b1924fa8e2dda87045b301a5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:04:35 +0100 Subject: [PATCH 083/174] python310Packages.claripy: 9.2.40 -> 9.2.41 --- pkgs/development/python-modules/claripy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/claripy/default.nix b/pkgs/development/python-modules/claripy/default.nix index db488dcae703..6f90b5b51ea6 100644 --- a/pkgs/development/python-modules/claripy/default.nix +++ b/pkgs/development/python-modules/claripy/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.2.40"; + version = "9.2.41"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-J56UP/6LoC9Tqf4zZb0Tup8la2a++9LCBwav3CclOuM="; + hash = "sha256-FX73LF8T6FaQNqN7EB1SCRAGZsChkEduNL2i8ATQuOE="; }; nativeBuildInputs = [ From 7e96ced3ea0539cf338136c07b1ccc3da66a0942 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:04:39 +0100 Subject: [PATCH 084/174] python310Packages.cle: 9.2.40 -> 9.2.41 --- pkgs/development/python-modules/cle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cle/default.nix b/pkgs/development/python-modules/cle/default.nix index 44c5937042d0..b9712c2a8271 100644 --- a/pkgs/development/python-modules/cle/default.nix +++ b/pkgs/development/python-modules/cle/default.nix @@ -16,7 +16,7 @@ let # The binaries are following the argr projects release cycle - version = "9.2.40"; + version = "9.2.41"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - hash = "sha256-xNVZzw5m8OZNoK2AcbaSOEbr7uTVcMI7HCgRqylayDo="; + hash = "sha256-v87ma0svBpVfx2SVLw8dx7HdOLQpNzjRwVj9yQs0bR8="; }; nativeBuildInputs = [ From 01e6f31e561bdf6107dd9f1dbae30e4017d7f9ce Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:04:44 +0100 Subject: [PATCH 085/174] python310Packages.angr: 9.2.40 -> 9.2.41 --- pkgs/development/python-modules/angr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/angr/default.nix b/pkgs/development/python-modules/angr/default.nix index e3ace1940ed6..9997ab09fd40 100644 --- a/pkgs/development/python-modules/angr/default.nix +++ b/pkgs/development/python-modules/angr/default.nix @@ -31,7 +31,7 @@ buildPythonPackage rec { pname = "angr"; - version = "9.2.40"; + version = "9.2.41"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -40,7 +40,7 @@ buildPythonPackage rec { owner = pname; repo = pname; rev = "v${version}"; - hash = "sha256-PA/88T7o+oEr/U33opGu1Tcvc0zT/WhChpJJV/AvCmw="; + hash = "sha256-HikfqU2k7w/IO51vOKNzCLWd+MphG1hXkJal5usQZOA="; }; propagatedBuildInputs = [ From b4c263953e0ef0d038002a250aa2b6bcf51bb0e0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 22:30:29 +0100 Subject: [PATCH 086/174] python310Packages.python-otbr-api: 1.0.5 -> 1.0.7 Changelog: https://github.com/home-assistant-libs/python-otbr-api/releases/tag/1.0.7 --- pkgs/development/python-modules/python-otbr-api/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-otbr-api/default.nix b/pkgs/development/python-modules/python-otbr-api/default.nix index 11f402cc7a9e..183fb31d065f 100644 --- a/pkgs/development/python-modules/python-otbr-api/default.nix +++ b/pkgs/development/python-modules/python-otbr-api/default.nix @@ -1,5 +1,6 @@ { lib , aiohttp +, bitstruct , buildPythonPackage , cryptography , fetchFromGitHub @@ -11,7 +12,7 @@ buildPythonPackage rec { pname = "python-otbr-api"; - version = "1.0.5"; + version = "1.0.7"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +21,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-yI7TzVJGSWdi+NKZ0CCOi3BC4WIqFuS7YZgihfWDBSY="; + hash = "sha256-R6H+h6IbyI/Qhwb6ACT2sx/YWmLDMyg4gLMJdmNj2wk="; }; nativeBuildInputs = [ @@ -29,6 +30,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp + bitstruct cryptography voluptuous ]; From 2011b1f0030f2f51537a22c5a24beb25ce9326d1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 7 Mar 2023 23:33:25 +0100 Subject: [PATCH 087/174] python310Packages.cemm: init at 0.5.1 --- .../python-modules/cemm/default.nix | 59 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/python-modules/cemm/default.nix diff --git a/pkgs/development/python-modules/cemm/default.nix b/pkgs/development/python-modules/cemm/default.nix new file mode 100644 index 000000000000..3036393344c9 --- /dev/null +++ b/pkgs/development/python-modules/cemm/default.nix @@ -0,0 +1,59 @@ +{ lib +, aiohttp +, aresponses +, buildPythonPackage +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "cemm"; + version = "0.5.1"; + format = "pyproject"; + + disabled = pythonOlder "3.9"; + + src = fetchFromGitHub { + owner = "klaasnicolaas"; + repo = "python-cemm"; + rev = "refs/tags/v${version}"; + hash = "sha256-BorgGHxoEeIGyJKqe9mFRDpcGHhi6/8IV7ubEI8yQE4="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace '"0.0.0"' '"${version}"' \ + --replace 'addopts = "--cov"' "" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + nativeCheckInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "cemm" + ]; + + meta = with lib; { + description = "Module for interacting with CEMM devices"; + homepage = "https://github.com/klaasnicolaas/python-cemm"; + changelog = "https://github.com/klaasnicolaas/python-cemm/releases/tag/v${version}"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1ac6c38143bb..18941bfff1ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1631,6 +1631,8 @@ self: super: with self; { cement = callPackage ../development/python-modules/cement { }; + cemm = callPackage ../development/python-modules/cemm { }; + censys = callPackage ../development/python-modules/censys { }; cexprtk = callPackage ../development/python-modules/cexprtk { }; From de134a16be5e6393b8852b4c4aa61bc623c13eb8 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Tue, 7 Mar 2023 23:31:15 +0100 Subject: [PATCH 088/174] chromium: 110.0.5481.177 -> 111.0.5563.64 https://chromereleases.googleblog.com/2023/03/stable-channel-update-for-desktop.html This update includes 40 security fixes. CVEs: CVE-2023-1213 CVE-2023-1214 CVE-2023-1215 CVE-2023-1216 CVE-2023-1217 CVE-2023-1218 CVE-2023-1219 CVE-2023-1220 CVE-2023-1221 CVE-2023-1222 CVE-2023-1223 CVE-2023-1224 CVE-2023-1225 CVE-2023-1226 CVE-2023-1227 CVE-2023-1228 CVE-2023-1229 CVE-2023-1230 CVE-2023-1231 CVE-2023-1232 CVE-2023-1233 CVE-2023-1234 CVE-2023-1235 CVE-2023-1236 --- .../browsers/chromium/upstream-info.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 65881b9ae8f0..17cd09e7ca95 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "110.0.5481.177", - "sha256": "1dy9l61r3fpl40ff790dbqqvw9l1svcgd7saz4whl9wm256labvv", - "sha256bin64": "0sylaf8b0rzr82dg7safvs5dxqqib26k4j6vlm75vs99dpnlznj2", + "version": "111.0.5563.64", + "sha256": "0x20zqwq051a5j76q1c3m0ddf1hhcm6fgz3b7rqrfamjppia0p3x", + "sha256bin64": "0rnqrjnybghb4h413cw3f54ga2x76mfmf1fp2nnf59c1yml4r4vf", "deps": { "gn": { "version": "2022-12-12", @@ -12,10 +12,10 @@ } }, "chromedriver": { - "version": "110.0.5481.77", - "sha256_linux": "1bdc4n9nz3m6vv0p4qr9v65zarbnkrbh21ivpvl7y7c25m7fxl20", - "sha256_darwin": "1scv9vvy5ybgbgycyz2wrymjhdqnvz0m6lxkax107437anxixs00", - "sha256_darwin_aarch64": "0gqayzhlif6hvsmpx04mxr1bld6kirv5q1n5dg42rc16gv954dkn" + "version": "111.0.5563.41", + "sha256_linux": "160khwa4x6w9gv5vkvalwbx87r6hrql0y0xr7zvxsir1x6rklwm2", + "sha256_darwin": "0z5q9r39jd5acyd79yzrkgqkvv3phdkyq4wvdsmhnpypazg072l6", + "sha256_darwin_aarch64": "0xiagydqnywzrpqq3i7363zhiywkp8ra9ygb2q1gznb40rx98pbr" } }, "beta": { From 779db7898ca58416f6d1e5bc3c4ed4dafd32879c Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 8 Mar 2023 08:44:59 +1000 Subject: [PATCH 089/174] go_1_20: 1.20.1 -> 1.20.2 Changelog: https://go.dev/doc/devel/release#go1.20 --- pkgs/development/compilers/go/1.20.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.20.nix b/pkgs/development/compilers/go/1.20.nix index f432e5468779..6d08c18b143e 100644 --- a/pkgs/development/compilers/go/1.20.nix +++ b/pkgs/development/compilers/go/1.20.nix @@ -46,11 +46,11 @@ let in stdenv.mkDerivation rec { pname = "go"; - version = "1.20.1"; + version = "1.20.2"; src = fetchurl { url = "https://go.dev/dl/go${version}.src.tar.gz"; - hash = "sha256-tcGjr1LDhabRx2rtU2HPJkWQI5gNAyDedli645FYMaI="; + hash = "sha256-TQ4oUNGXtN2tO9sBljABedCVuzrv1N+8OzZwLDco+Ks="; }; strictDeps = true; From 1e36120c94ad86c19c080e919a84f1ce3d1204e5 Mon Sep 17 00:00:00 2001 From: Malo Bourgon Date: Wed, 8 Mar 2023 10:00:08 +1100 Subject: [PATCH 090/174] signalbackup-tools: 20230305 -> 20230307-1 Diff: https://github.com/bepaald/signalbackup-tools/compare/20230305...20230307-1 --- .../instant-messengers/signalbackup-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix index 4af046ed54be..6f6a3867fcab 100644 --- a/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix +++ b/pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix @@ -2,13 +2,13 @@ (if stdenv.isDarwin then clang14Stdenv else stdenv).mkDerivation rec { pname = "signalbackup-tools"; - version = "20230305"; + version = "20230307-1"; src = fetchFromGitHub { owner = "bepaald"; repo = pname; rev = version; - hash = "sha256-UW7FYVU8SEGck48o6sfwEbSHPHEn5WjGJspUjf7hIAE="; + hash = "sha256-+FjjGsYMmleN+TDKFAsvC9o81gVhZHIrUgrWuzksxZU="; }; postPatch = '' From 992b72241df579171f3d3a34c0338fda89c315aa Mon Sep 17 00:00:00 2001 From: OPNA2608 Date: Wed, 8 Mar 2023 00:25:30 +0100 Subject: [PATCH 091/174] katawa-shoujo: Add desktop file unrpa works again so we can extract the icon from the game assets for it. --- pkgs/games/katawa-shoujo/default.nix | 22 ++++++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/pkgs/games/katawa-shoujo/default.nix b/pkgs/games/katawa-shoujo/default.nix index aeee79c5c029..e549fbbcf963 100644 --- a/pkgs/games/katawa-shoujo/default.nix +++ b/pkgs/games/katawa-shoujo/default.nix @@ -2,7 +2,9 @@ , lib , fetchurl , autoPatchelfHook +, copyDesktopItems , freetype +, makeDesktopItem , makeWrapper , libGL , libGLU @@ -21,6 +23,7 @@ , SDL_image , SDL_ttf , undmg +, unrpa , zlib }: @@ -52,6 +55,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = lib.optionals stdenv.hostPlatform.isLinux [ autoPatchelfHook + copyDesktopItems + unrpa ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ makeWrapper undmg @@ -73,6 +78,15 @@ stdenv.mkDerivation rec { libGLU ]; + desktopItems = [(makeDesktopItem rec { + name = "katawa-shoujo"; + desktopName = "Katawa Shoujo"; + comment = meta.description; + exec = name; + icon = name; + categories = [ "Game" ]; + })]; + dontConfigure = true; dontBuild = true; @@ -103,11 +117,15 @@ stdenv.mkDerivation rec { exec \$RENPY_GDB ${libDir}/'Katawa Shoujo' \$RENPY_PYARGS -EO ${dataDir}/'Katawa Shoujo'.py "\$@" EOF - '' + lib.optionalString stdenv.hostPlatform.isDarwin '' + '' + (if stdenv.hostPlatform.isDarwin then '' # No autoPatchelfHook on Darwin wrapProgram ${bin} \ --prefix DYLD_LIBRARY_PATH : ${lib.makeLibraryPath buildInputs} - '' + '' + '' else '' + # Extract icon for xdg desktop file + unrpa ${dataDir}/game/data.rpa + install -Dm644 ui/icon.png $out/share/icons/hicolor/512x512/apps/katawa-shoujo.png + '') + '' # Delete binaries for wrong arch, autoPatchelfHook gets confused by them & less to keep in the store find "$(dirname ${libDir})" -mindepth 1 -maxdepth 1 \ From 43dcf6a240cce10e04ebfde7da6b6f5c4f17ad3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 00:30:35 +0100 Subject: [PATCH 092/174] python310Packages.app-model: 0.1.1 -> 0.1.2 Diff: https://github.com/pyapp-kit/app-model/compare/refs/tags/v0.1.1...v0.1.2 Changelog: https://github.com/pyapp-kit/app-model/blob/v0.1.2/CHANGELOG.md --- .../development/python-modules/app-model/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/app-model/default.nix b/pkgs/development/python-modules/app-model/default.nix index 2ada38bfb14e..1191be3c823d 100644 --- a/pkgs/development/python-modules/app-model/default.nix +++ b/pkgs/development/python-modules/app-model/default.nix @@ -7,13 +7,13 @@ , pytestCheckHook , pythonOlder , typing-extensions -, setuptools-scm -, setuptools +, hatch-vcs +, hatchling }: buildPythonPackage rec { pname = "app-model"; - version = "0.1.1"; + version = "0.1.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,14 +22,14 @@ buildPythonPackage rec { owner = "pyapp-kit"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-nZnIb2QHfpkPirjQPiBdLd7pc1NNn97fdjGxKs0lWQU="; + hash = "sha256-W1DL6HkqXkfVE9SPD0cUhPln5FBW5vPICpbQulRhaWs="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; nativeBuildInputs = [ - setuptools - setuptools-scm + hatch-vcs + hatchling ]; propagatedBuildInputs = [ From 43a3285b1ee7058cf90db774f169f4d5f48bfe97 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 5 Mar 2023 20:48:59 +0100 Subject: [PATCH 093/174] kubescape: 2.0.161 -> 2.2.3 Diff: https://github.com/armosec/kubescape.git/compare/refs/tags/v2.0.161...v2.2.3 Changelog: https://github.com/armosec/kubescape/releases/tag/v2.2.3 --- pkgs/tools/security/kubescape/default.nix | 21 +++++++-------------- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index e8c9aa896e77..3fd25b8647e1 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,15 +6,17 @@ buildGoModule rec { pname = "kubescape"; - version = "2.0.161"; + version = "2.2.3"; src = fetchFromGitHub { owner = "armosec"; repo = pname; - rev = "v${version}"; - hash = "sha256-rsO6ZTQg5fmpp+5Zx36tQnDW1vf2k+FCI3cFbGZifVM="; + rev = "refs/tags/v${version}"; + hash = "sha256-qb8Kk+d3KFf+GVHv6Tg1qBuX6xFS4zbpkCPc502alxU="; + fetchSubmodules = true; }; - vendorSha256 = "sha256-EinrVdGdYroh0X/ACAVD2gw4k0jrPHQ3Ucb3TUYKd8Q="; + + vendorHash = "sha256-KoAuM1H9FRcPLD0AipnXOCUiNHcCWnek4sV0ztu5SyI="; nativeBuildInputs = [ installShellFiles @@ -39,6 +41,7 @@ buildGoModule rec { # remove tests that use networking rm core/pkg/resourcehandler/urlloader_test.go + rm core/pkg/opaprocessor/*_test.go # remove tests that use networking substituteInPlace core/pkg/resourcehandler/repositoryscanner_test.go \ @@ -57,16 +60,6 @@ buildGoModule rec { --zsh <($out/bin/kubescape completion zsh) ''; - doInstallCheck = true; - installCheckPhase = '' - runHook preInstallCheck - $out/bin/kubescape --help - # `--version` vs `version` shows the version without checking for latest - # if the flag is missing the BuildNumber may have moved - $out/bin/kubescape --version | grep "v${version}" - runHook postInstallCheck - ''; - meta = with lib; { description = "Tool for testing if Kubernetes is deployed securely"; homepage = "https://github.com/armosec/kubescape"; From 2d7bb420c8d4bd47bfb8f9b345da7a38ebea78a6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 00:05:19 +0000 Subject: [PATCH 094/174] arkade: 0.9.3 -> 0.9.4 --- pkgs/applications/networking/cluster/arkade/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index d2a63475e350..020277a33e7a 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "arkade"; - version = "0.9.3"; + version = "0.9.4"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-UEtKjZgVaNW6GyCId9D/61mmd79IxV4kPQXbyDpDU1Y="; + sha256 = "sha256-r3cSHiNlWrP7JCqYOy86mn6ssfDEbm6DYerVCoARz7M="; }; CGO_ENABLED = 0; From 8bde91a3ab6451c60c426a5f4d840c65d77c9efd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Mon, 6 Mar 2023 18:06:36 -0800 Subject: [PATCH 095/174] kbibtex: 0.9.3.1 -> 0.9.3.2 Changelog: https://invent.kde.org/office/kbibtex/-/raw/v0.9.3.2/ChangeLog --- pkgs/applications/office/kbibtex/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/kbibtex/default.nix b/pkgs/applications/office/kbibtex/default.nix index e3e3106b8302..8e799917304e 100644 --- a/pkgs/applications/office/kbibtex/default.nix +++ b/pkgs/applications/office/kbibtex/default.nix @@ -5,7 +5,6 @@ , extra-cmake-modules , shared-mime-info # Qt -, qtnetworkauth , qtxmlpatterns , qtwebengine , qca-qt5 @@ -29,13 +28,13 @@ mkDerivation rec { pname = "kbibtex"; - version = "0.9.3.1"; + version = "0.9.3.2"; src = let majorMinorPatch = lib.concatStringsSep "." (lib.take 3 (lib.splitVersion version)); in fetchurl { url = "mirror://kde/stable/KBibTeX/${majorMinorPatch}/kbibtex-${version}.tar.xz"; - hash = "sha256-kH/E5xv9dmzM7WrIMlGCo4y0Xv/7XHowELJP3OJz8kQ="; + hash = "sha256-BzPCTKMiMnzz2S+jbk4ZbEudyJX5EaTDVY59te/AxFc="; }; nativeBuildInputs = [ @@ -44,7 +43,6 @@ mkDerivation rec { ]; buildInputs = [ - qtnetworkauth qtxmlpatterns qtwebengine qca-qt5 From 4ffa19a0e91bd24c0e93839c4062987f4ddaa633 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 01:26:48 +0100 Subject: [PATCH 096/174] kubescape: 2.2.3 -> 2.2.4 Diff: https://github.com/kubescape/kubescape.git/compare/refs/tags/v2.2.3...v2.2.4 Changelog: https://github.com/kubescape/kubescape/releases/tag/v2.2.4 --- pkgs/tools/security/kubescape/default.nix | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix index 3fd25b8647e1..24820d08f909 100644 --- a/pkgs/tools/security/kubescape/default.nix +++ b/pkgs/tools/security/kubescape/default.nix @@ -6,13 +6,13 @@ buildGoModule rec { pname = "kubescape"; - version = "2.2.3"; + version = "2.2.4"; src = fetchFromGitHub { - owner = "armosec"; + owner = "kubescape"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-qb8Kk+d3KFf+GVHv6Tg1qBuX6xFS4zbpkCPc502alxU="; + hash = "sha256-poLPG8C0YbjEFjqWMKO+9plArenkVmR5lGvflgxc3Iw="; fetchSubmodules = true; }; @@ -25,7 +25,7 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/armosec/kubescape/v2/core/cautils.BuildNumber=v${version}" + "-X github.com/kubescape/kubescape/v2/core/cautils.BuildNumber=v${version}" ]; subPackages = [ "." ]; @@ -60,10 +60,19 @@ buildGoModule rec { --zsh <($out/bin/kubescape completion zsh) ''; + doInstallCheck = true; + + installCheckPhase = '' + runHook preInstallCheck + $out/bin/kubescape --help + $out/bin/kubescape version | grep "v${version}" + runHook postInstallCheck + ''; + meta = with lib; { description = "Tool for testing if Kubernetes is deployed securely"; - homepage = "https://github.com/armosec/kubescape"; - changelog = "https://github.com/armosec/kubescape/releases/tag/v${version}"; + homepage = "https://github.com/kubescape/kubescape"; + changelog = "https://github.com/kubescape/kubescape/releases/tag/v${version}"; longDescription = '' Kubescape is the first open-source tool for testing if Kubernetes is deployed securely according to multiple frameworks: regulatory, customized From 45a706c5991d6c305ed7942c7b3ec9e23242342e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Mar 2023 16:24:39 -0800 Subject: [PATCH 097/174] python310Packages.prance: 0.21.8.0 -> 0.22.02.22.0 Diff: https://github.com/RonnyPfannschmidt/prance/compare/v0.21.8.0...v0.22.02.22.0 Changelog: https://github.com/RonnyPfannschmidt/prance/blob/v0.22.02.22.0/CHANGES.rst --- .../python-modules/prance/default.nix | 53 +++++++++---------- 1 file changed, 24 insertions(+), 29 deletions(-) diff --git a/pkgs/development/python-modules/prance/default.nix b/pkgs/development/python-modules/prance/default.nix index 9f730b2f39f9..25ceb1259c5f 100644 --- a/pkgs/development/python-modules/prance/default.nix +++ b/pkgs/development/python-modules/prance/default.nix @@ -1,54 +1,39 @@ { lib , buildPythonPackage +, pythonOlder , fetchFromGitHub -, fetchpatch , chardet +, click +, flex +, packaging +, pyicu , requests , ruamel-yaml , setuptools-scm , six -, semver +, swagger-spec-validator , pytestCheckHook , openapi-spec-validator }: buildPythonPackage rec { pname = "prance"; - version = "0.21.8.0"; + version = "0.22.02.22.0"; format = "pyproject"; + disabled = pythonOlder "3.8"; + src = fetchFromGitHub { owner = "RonnyPfannschmidt"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - hash = "sha256-kGANMHfWwhW3ZBw2ZVCJZR/bV2EPhcydMKhDeDTVwcQ="; + hash = "sha256-NtIbZp34IcMYJzaNQVL9GLdNS3NYOCRoWS1wGg/gLVA="; }; - patches = [ - # Fix for openapi-spec-validator 0.5.0+: - # https://github.com/RonnyPfannschmidt/prance/pull/132 - (fetchpatch { - name = "1-openapi-spec-validator-upgrade.patch"; - url = "https://github.com/RonnyPfannschmidt/prance/commit/55503c9b12b685863c932ededac996369e7d288a.patch"; - hash = "sha256-7SOgFsk2aaaaAYS8WJ9axqQFyEprurn6Zn12NcdQ9Bg="; - }) - (fetchpatch { - name = "2-openapi-spec-validator-upgrade.patch"; - url = "https://github.com/RonnyPfannschmidt/prance/commit/7e59cc69c6c62fd04875105773d9d220bb58fea6.patch"; - hash = "sha256-j6vmY3NqDswp7v9682H+/MxMGtFObMxUeL9Wbiv9hYw="; - }) - (fetchpatch { - name = "3-openapi-spec-validator-upgrade.patch"; - url = "https://github.com/RonnyPfannschmidt/prance/commit/7e575781d83845d7ea0c2eff57644df9b465c7af.patch"; - hash = "sha256-rexKoQ+TH3QmP20c3bA+7BLMLc+fkVhn7xsq+gle1Aw="; - }) - ]; - postPatch = '' substituteInPlace setup.cfg \ - --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" \ - --replace "chardet>=3.0,<5.0" "chardet" + --replace "--cov=prance --cov-report=term-missing --cov-fail-under=90" "" ''; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -59,27 +44,37 @@ buildPythonPackage rec { propagatedBuildInputs = [ chardet + packaging requests ruamel-yaml six - semver ]; + passthru.optional-dependencies = { + cli = [ click ]; + flex = [ flex ]; + icu = [ pyicu ]; + osv = [ openapi-spec-validator ]; + ssv = [ swagger-spec-validator ]; + }; + nativeCheckInputs = [ pytestCheckHook - openapi-spec-validator - ]; + ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies); # Disable tests that require network disabledTestPaths = [ "tests/test_convert.py" ]; disabledTests = [ + "test_convert_defaults" + "test_convert_output" "test_fetch_url_http" ]; pythonImportsCheck = [ "prance" ]; meta = with lib; { + changelog = "https://github.com/RonnyPfannschmidt/prance/blob/${src.rev}/CHANGES.rst"; description = "Resolving Swagger/OpenAPI 2.0 and 3.0.0 Parser"; homepage = "https://github.com/RonnyPfannschmidt/prance"; license = licenses.mit; From 34f4be4ad2e7d153f370570ccec8467bec1b23d4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Mar 2023 16:17:18 -0800 Subject: [PATCH 098/174] python310Packages.apispec: 6.1.0 -> 6.2.0 Changelog: https://github.com/marshmallow-code/apispec/blob/6.2.0/CHANGELOG.rst --- pkgs/development/python-modules/apispec/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/apispec/default.nix b/pkgs/development/python-modules/apispec/default.nix index f385c87d8558..e24e6c9279d9 100644 --- a/pkgs/development/python-modules/apispec/default.nix +++ b/pkgs/development/python-modules/apispec/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "apispec"; - version = "6.1.0"; + version = "6.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-iB07kL//3tZZvApL8J6t7t+iVs0nFyaxVV11r54Kmmk="; + hash = "sha256-GpSaYLtMQr7leqr11DwYTfPi6W2WWORC513UQ1z2CWE="; }; propagatedBuildInputs = [ @@ -37,7 +37,7 @@ buildPythonPackage rec { validation = [ openapi-spec-validator prance - ]; + ] ++ prance.optional-dependencies.osv; }; nativeCheckInputs = [ From c051db62ce639d91f4e039dbc5fc1b090b0a35e8 Mon Sep 17 00:00:00 2001 From: Gabriel Dougherty Date: Mon, 6 Mar 2023 21:49:11 -0500 Subject: [PATCH 099/174] linvstmanager: init at 1.1.1 --- maintainers/maintainer-list.nix | 6 ++++ .../audio/linvstmanager/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 44 insertions(+) create mode 100644 pkgs/applications/audio/linvstmanager/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 183f18e3042d..1e795dfc9989 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -5256,6 +5256,12 @@ githubId = 606000; name = "Gabriel Adomnicai"; }; + GabrielDougherty = { + email = "contact@gabrieldougherty.com"; + github = "GabrielDougherty"; + githubId = 10541219; + name = "Gabriel Dougherty"; + }; garaiza-93 = { email = "araizagustavo93@gmail.com"; github = "garaiza-93"; diff --git a/pkgs/applications/audio/linvstmanager/default.nix b/pkgs/applications/audio/linvstmanager/default.nix new file mode 100644 index 000000000000..dc8376c4166f --- /dev/null +++ b/pkgs/applications/audio/linvstmanager/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtbase +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "linvstmanager"; + version = "1.1.1"; + + src = fetchFromGitHub { + owner = "Goli4thus"; + repo = "linvstmanager"; + rev = "v${version}"; + hash = "sha256-K6eugimMy/MZgHYkg+zfF8DDqUuqqoeymxHtcFGu2Uk="; + }; + + nativeBuildInputs = [ + cmake + wrapQtAppsHook + ]; + + buildInputs = [ + qtbase + ]; + + meta = with lib; { + description = "Graphical companion application for various bridges like LinVst, etc"; + homepage = "https://github.com/Goli4thus/linvstmanager"; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.GabrielDougherty ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e545c2a710b..6a6055f10787 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30117,6 +30117,8 @@ with pkgs; linssid = libsForQt5.callPackage ../applications/networking/linssid { }; + linvstmanager = qt5.callPackage ../applications/audio/linvstmanager { }; + deadd-notification-center = callPackage ../applications/misc/deadd-notification-center { }; lollypop = callPackage ../applications/audio/lollypop { }; From 938d9f5b39bf17b15bc1c52112c135ffc503b4a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 3 Mar 2023 16:01:19 -0800 Subject: [PATCH 100/174] python310Packages.herepy: 3.5.8 -> 3.6.0 Diff: https://github.com/abdullahselek/HerePy/compare/refs/tags/3.5.8...3.6.0 Changelog: https://github.com/abdullahselek/HerePy/releases/tag/3.6.0 --- pkgs/development/python-modules/herepy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/herepy/default.nix b/pkgs/development/python-modules/herepy/default.nix index c0c5fb0742f1..379790d4b79b 100644 --- a/pkgs/development/python-modules/herepy/default.nix +++ b/pkgs/development/python-modules/herepy/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "herepy"; - version = "3.5.8"; + version = "3.6.0"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "abdullahselek"; repo = "HerePy"; rev = "refs/tags/${version}"; - hash = "sha256-BwuH3GxEXiIFFM0na8Jhgp7J5TPW41/u89LWf+EprG4="; + hash = "sha256-wz6agxPKQvWobRIiYKYU2og33tzswd0qG1hawPCh1qI="; }; propagatedBuildInputs = [ From cbb6abb8025f2d9503700667810a1289d36f5bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 5 Mar 2023 19:57:02 -0800 Subject: [PATCH 101/174] python311Packages.fire: fix tests --- pkgs/development/python-modules/fire/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/fire/default.nix b/pkgs/development/python-modules/fire/default.nix index f17bc7923f8b..1055bada787e 100644 --- a/pkgs/development/python-modules/fire/default.nix +++ b/pkgs/development/python-modules/fire/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, fetchpatch , six , hypothesis , mock @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-cwY1RRNtpAn6LnBASQLTNf4XXSPnfhOa1WgglGEM2/s="; }; + patches = [ + # https://github.com/google/python-fire/pull/440 + (fetchpatch { + name = "remove-asyncio-coroutine.patch"; + url = "https://github.com/google/python-fire/pull/440/commits/30b775a7b36ce7fbc04656c7eec4809f99d3e178.patch"; + hash = "sha256-GDAAlvZKbJl3OhajsEO0SZvWIXcPDi3eNKKVgbwSNKk="; + }) + ]; + propagatedBuildInputs = [ six termcolor From 7018cf78c618e0a8ec4369c587319f51cb7b19b0 Mon Sep 17 00:00:00 2001 From: Connor Baker Date: Tue, 7 Mar 2023 20:36:45 -0500 Subject: [PATCH 102/174] magma: fix for cuda_profiler_api.h for CUDA 11.8+ --- pkgs/development/libraries/science/math/magma/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/science/math/magma/generic.nix b/pkgs/development/libraries/science/math/magma/generic.nix index c997fcc09013..6ab68e297c2c 100644 --- a/pkgs/development/libraries/science/math/magma/generic.nix +++ b/pkgs/development/libraries/science/math/magma/generic.nix @@ -95,7 +95,10 @@ let cuda_cudart # cuda_runtime.h libcublas libcusparse + ] ++ lists.optionals (strings.versionOlder cudaVersion "11.8") [ cuda_nvprof # + ] ++ lists.optionals (strings.versionAtLeast cudaVersion "11.8") [ + cuda_profiler_api # ]; }; in From 22c6c5609143c5714cf7f3028f0f9744b8d27040 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:42:54 +0200 Subject: [PATCH 103/174] opa: migrate to OCaml 4.14 --- pkgs/development/compilers/opa/default.nix | 10 +- .../compilers/opa/ocaml-4.14-tags.patch | 191 ++++++++++++++++++ .../compilers/opa/ocaml-4.14.patch | 63 ++++++ pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 262 insertions(+), 4 deletions(-) create mode 100644 pkgs/development/compilers/opa/ocaml-4.14-tags.patch create mode 100644 pkgs/development/compilers/opa/ocaml-4.14.patch diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index 2843625daef2..0eb4240d12f4 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -15,7 +15,12 @@ stdenv.mkDerivation rec { sha256 = "1qs91rq9xrafv2mf2v415k8lv91ab3ycz0xkpjh1mng5ca3pjlf3"; }; - patches = [ ./ocaml-4.03.patch ./ocaml-4.04.patch ]; + patches = [ + ./ocaml-4.03.patch + ./ocaml-4.04.patch + ./ocaml-4.14.patch + ./ocaml-4.14-tags.patch + ]; # Paths so the opa compiler code generation will use the same programs as were # used to build opa. @@ -37,7 +42,6 @@ stdenv.mkDerivation rec { export CAMLP4O=${ocamlPackages.camlp4}/bin/camlp4o export CAMLP4ORF=${ocamlPackages.camlp4}/bin/camlp4orf export OCAMLBUILD=${ocamlPackages.ocamlbuild}/bin/ocamlbuild - substituteInPlace _tags --replace ', warn_error_A' "" ''; prefixKey = "-prefix "; @@ -47,7 +51,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gcc binutils nodejs which makeWrapper ]; buildInputs = [ perl jdk openssl coreutils zlib ncurses ] ++ (with ocamlPackages; [ - ocaml findlib ssl camlzip ulex ocamlgraph camlp4 + ocaml findlib ssl camlzip ulex ocamlgraph camlp4 num ]); NIX_LDFLAGS = lib.optionalString (!stdenv.isDarwin) "-lgcc_s"; diff --git a/pkgs/development/compilers/opa/ocaml-4.14-tags.patch b/pkgs/development/compilers/opa/ocaml-4.14-tags.patch new file mode 100644 index 000000000000..b620cd0ceaed --- /dev/null +++ b/pkgs/development/compilers/opa/ocaml-4.14-tags.patch @@ -0,0 +1,191 @@ +diff --git a/Makefile b/Makefile +index 37589e1..10d3418 100644 +--- a/Makefile ++++ b/Makefile +@@ -14,6 +14,7 @@ OPALANG_DIR ?= . + + MAKE ?= $_ + OCAMLBUILD_OPT ?= -j 6 ++OCAMLBUILD_OPT += -use-ocamlfind -package num + + ifndef NO_REBUILD_OPA_PACKAGES + OPAOPT += --rebuild +diff --git a/_tags b/_tags +index 5d8d922..b6bdd5e 100644 +--- a/_tags ++++ b/_tags +@@ -15,4 +15,4 @@ + <{ocamllib,compiler,lib,tools}>: include + + # Warnings +-<**/*.ml>: warn_L, warn_Z, warn_error_A ++<**/*.ml>: warn_L, warn_Z +diff --git a/compiler/_tags b/compiler/_tags +index b33eeeb..7afa493 100644 +--- a/compiler/_tags ++++ b/compiler/_tags +@@ -7,6 +7,6 @@ + + : use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_passlib, use_libbsl, use_qmloptions, use_qml2js, use_js_passes, use_opa + +-: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_js_passes, use_opa ++: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_js_passes, use_opa + + : with_mlstate_debug +diff --git a/compiler/jslang/_tags b/compiler/jslang/_tags +index f33b592..8925703 100644 +--- a/compiler/jslang/_tags ++++ b/compiler/jslang/_tags +@@ -4,7 +4,7 @@ + : use_camlp4, camlp4orf_fixed + + # todo: find a way to link fewer libs +-<{jspp,jsstat,globalizer}.{byte,native}>: use_passlib, use_opacapi, use_libtrx, use_ulex, use_str, use_unix, use_buildinfos, use_libbase, use_libqmlcompil, use_compilerlib, use_graph, use_nums, use_dynlink, use_jslang, use_ocamllang, use_libbsl, use_opalang, use_pplib, use_qmloptions, use_qml2js, use_qmlcpsrewriter, use_qmlpasses ++<{jspp,jsstat,globalizer}.{byte,native}>: use_passlib, use_opacapi, use_libtrx, use_ulex, use_str, use_unix, use_buildinfos, use_libbase, use_libqmlcompil, use_compilerlib, use_graph, use_dynlink, use_jslang, use_ocamllang, use_libbsl, use_opalang, use_pplib, use_qmloptions, use_qml2js, use_qmlcpsrewriter, use_qmlpasses + <{jspp,jsstat,globalizer}.{ml,byte,native}>: use_qmljsimp + + : use_libjsminify +diff --git a/compiler/libbsl/_tags b/compiler/libbsl/_tags +index cad1fe4..8ef238b 100644 +--- a/compiler/libbsl/_tags ++++ b/compiler/libbsl/_tags +@@ -20,7 +20,7 @@ + : use_libtrx + : use_libtrx + : use_jslang +-: use_ulex, use_libbsl, use_dynlink, use_zip, use_nums ++: use_ulex, use_libbsl, use_dynlink, use_zip + : use_ulex, use_libbsl, use_dynlink, use_zip, use_nums + : use_ulex, use_dynlink, use_zip, use_nums, use_jslang + : use_jslang +@@ -30,7 +30,7 @@ + : ignore + + # applications, linking +-<*.{byte,native}>:use_buildinfos, use_ulex, use_libtrx, use_dynlink, use_unix, thread, use_graph, use_libbsl, use_passlib, use_zip, use_nums, use_opalang, use_ocamllang, use_langlang, use_jslang, use_opacapi ++<*.{byte,native}>:use_buildinfos, use_ulex, use_libtrx, use_dynlink, thread, use_graph, use_libbsl, use_passlib, use_zip, use_opalang, use_ocamllang, use_langlang, use_jslang, use_opacapi + + # ppdebug (pl. be very specific with the use of ppdebug) + : with_mlstate_debug +diff --git a/compiler/opa/_tags b/compiler/opa/_tags +index cfe97a1..702af34 100644 +--- a/compiler/opa/_tags ++++ b/compiler/opa/_tags +@@ -62,7 +62,7 @@ + : use_opalib, use_opalang, use_opapasses, use_libqmlcompil, use_passlib + + # linking +-<{opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_qmloptions ++<{opa_parse,checkopacapi,gen_opa_manpage,syntaxHelper}.{byte,native}>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_qmloptions + + : with_mlstate_debug + : with_mlstate_debug +diff --git a/compiler/opalang/_tags b/compiler/opalang/_tags +index 6844281..8f0eaec 100644 +--- a/compiler/opalang/_tags ++++ b/compiler/opalang/_tags +@@ -14,7 +14,7 @@ true: warn_Z + : use_buildinfos, use_compilerlib, use_pplib + <**/*.{ml,mli}>: use_libbase, use_compilerlib, use_libqmlcompil, use_passlib + +-<{opa2opa,standaloneparser}.{native,byte}>: use_unix, use_libbase, use_mutex, use_graph, use_str, use_zlib, thread, use_nums, use_libtrx, use_passlib, use_libqmlcompil, use_buildinfos, use_ulex, use_compilerlib, use_pplib, use_opacapi ++<{opa2opa,standaloneparser}.{native,byte}>: use_libbase, use_mutex, use_graph, use_str, use_zlib, thread, use_libtrx, use_passlib, use_libqmlcompil, use_buildinfos, use_ulex, use_compilerlib, use_pplib, use_opacapi + + : use_opacapi + : use_opacapi +diff --git a/compiler/opx2js/_tags b/compiler/opx2js/_tags +index 7e9b9cc..3e257ea 100644 +--- a/compiler/opx2js/_tags ++++ b/compiler/opx2js/_tags +@@ -2,7 +2,7 @@ + + <**/*.{ml,mli}>: use_buildinfos, use_libbase, use_compilerlib, use_passlib + +-<**/*.native>: thread, use_dynlink, use_graph, use_str, use_unix, use_nums, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_libopa ++<**/*.native>: thread, use_dynlink, use_graph, use_str, use_zip, use_buildinfos, use_libbase, use_ulex, use_libtrx, use_libqmlcompil, use_libbsl, use_opalib, use_opalang, use_opapasses, use_qmlfakecompiler, use_qmlflatcompiler, use_qmloptions, use_qmljsimp, use_qml2js, use_opabsl_for_compiler, use_qmlslicer, use_jslang, use_qmlcpsrewriter, use_ocamllang, use_passlib, use_compilerlib, use_pplib, use_qmlpasses, use_opacapi, use_libopa + + <**/opx2jsPasses.{ml,mli}>: use_jslang, use_opalib, use_opalang, use_opapasses, use_libopa, use_libqmlcompil, use_qmlpasses, use_qmlcpsrewriter, use_qmlslicer + +diff --git a/compiler/passes/_tags b/compiler/passes/_tags +index a0daff4..9644d3a 100644 +--- a/compiler/passes/_tags ++++ b/compiler/passes/_tags +@@ -1,7 +1,7 @@ + # -*- conf -*- (for emacs) + + # preprocessing +-true: with_mlstate_debug, warn_A, warn_e, warn_error_A, warnno_48 ++true: with_mlstate_debug, warn_A, warn_e, warnno_48 + + <**/*.{ml,mli}>: use_libbase, use_libqmlcompil, use_passlib, use_opalang, use_compilerlib, use_opacapi + : use_opalib, use_libbsl +diff --git a/compiler/passlib/_tags b/compiler/passlib/_tags +index 2b9cfcf..5cb3145 100644 +--- a/compiler/passlib/_tags ++++ b/compiler/passlib/_tags +@@ -1,6 +1,6 @@ + # -*- conf -*- (for emacs) + +-<*.{ml,mli,byte,native}>: use_libbase, use_compilerlib, thread, use_ulex, use_unix, use_str ++<*.{ml,mli,byte,native}>: use_libbase, use_compilerlib, thread, use_ulex, use_str + + : use_buildinfos + : use_buildinfos, use_graph +diff --git a/compiler/qmlcompilers/_tags b/compiler/qmlcompilers/_tags +index 087165c..87ae918 100644 +--- a/compiler/qmlcompilers/_tags ++++ b/compiler/qmlcompilers/_tags +@@ -5,7 +5,7 @@ + + # application, linkink + # common +-<{qmljs_exe}.{ml,mli,byte,native}>: thread, use_unix, use_dynlink, use_str, use_graph, use_ulex, use_libtrx, use_pplib, use_opabsl_for_compiler, use_passlib, use_nums, use_buildinfos, use_opalang, use_compilerlib, use_opacapi ++<{qmljs_exe}.{ml,mli,byte,native}>: thread, use_dynlink, use_str, use_graph, use_ulex, use_libtrx, use_pplib, use_opabsl_for_compiler, use_passlib, use_buildinfos, use_opalang, use_compilerlib, use_opacapi + + # specific + : use_qmljsimp, use_qml2js, use_zip +diff --git a/ocamllib/libbase/_tags b/ocamllib/libbase/_tags +index 42d067d..6b7e690 100644 +--- a/ocamllib/libbase/_tags ++++ b/ocamllib/libbase/_tags +@@ -27,4 +27,4 @@ + : with_mlstate_debug + + +-<{testconsole,testfilepos}.{ml,mli,byte,native}>: thread, use_str, use_unix, use_libbase, use_ulex ++<{testconsole,testfilepos}.{ml,mli,byte,native}>: thread, use_str, use_libbase, use_ulex +diff --git a/tools/_tags b/tools/_tags +index 549752b..44c97b3 100644 +--- a/tools/_tags ++++ b/tools/_tags +@@ -8,7 +8,7 @@ + : include + + # Odep +-: thread, use_str, use_unix, use_graph, use_zip, use_libbase, use_ulex ++: thread, use_str, use_graph, use_zip, use_libbase, use_ulex + + ### + # Ofile +@@ -16,7 +16,7 @@ + : use_libbase + + # linking +-: use_unix, use_str, thread, use_ulex, use_libbase, use_zip ++: use_str, thread, use_ulex, use_libbase, use_zip + + ### + # jschecker +diff --git a/tools/teerex/_tags b/tools/teerex/_tags +index d662b49..366ea01 100644 +--- a/tools/teerex/_tags ++++ b/tools/teerex/_tags +@@ -6,6 +6,6 @@ + + <*.{ml,mli,byte,native}>: use_str, use_libbase, use_compilerlib, use_graph, use_libtrx, use_ocamllang, use_zip, use_buildinfos, use_passlib + +-: thread, use_unix ++: thread + : thread, use_unix +-: thread, use_unix ++: thread diff --git a/pkgs/development/compilers/opa/ocaml-4.14.patch b/pkgs/development/compilers/opa/ocaml-4.14.patch new file mode 100644 index 000000000000..7df254f3af49 --- /dev/null +++ b/pkgs/development/compilers/opa/ocaml-4.14.patch @@ -0,0 +1,63 @@ +diff --git a/compiler/compilerlib/objectFiles.ml b/compiler/compilerlib/objectFiles.ml +index d0e7223..5fee601 100644 +--- a/compiler/compilerlib/objectFiles.ml ++++ b/compiler/compilerlib/objectFiles.ml +@@ -339,8 +339,9 @@ let dirname (package:package_name) : filename = Filename.concat !opxdir (unprefi + let unprefixed_dirname_plugin (package:package_name) : filename = package ^ "." ^ Name.plugin_ext + let dirname_plugin (package:package_name) : filename = Filename.concat !opxdir (unprefixed_dirname_plugin package) + let dirname_from_package ((package_name,_):package) = dirname package_name +-let undirname filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.object_ext) +-let undirname_plugin filename : package_name = Filename.chop_suffix (Filename.basename filename) ("."^Name.plugin_ext) ++let chop_suffix name suff = try Filename.chop_suffix name suff with _ -> name ++let undirname filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.object_ext) ++let undirname_plugin filename : package_name = chop_suffix (Filename.basename filename) ("."^Name.plugin_ext) + let filename_from_dir dir pass = Filename.concat dir pass + let filename_from_package package pass = filename_from_dir (dirname_from_package package) pass + +diff --git a/ocamllib/libbase/baseHashtbl.ml b/ocamllib/libbase/baseHashtbl.ml +index 439d76c..7be6cf9 100644 +--- a/ocamllib/libbase/baseHashtbl.ml ++++ b/ocamllib/libbase/baseHashtbl.ml +@@ -29,7 +29,6 @@ let iter = Hashtbl.iter + let fold = Hashtbl.fold + let length = Hashtbl.length + let hash = Hashtbl.hash +-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" + module type HashedType = Hashtbl.HashedType + + (* could be done (with magic) more efficiently +diff --git a/ocamllib/libbase/baseHashtbl.mli b/ocamllib/libbase/baseHashtbl.mli +index 1a2b146..10e448b 100644 +--- a/ocamllib/libbase/baseHashtbl.mli ++++ b/ocamllib/libbase/baseHashtbl.mli +@@ -41,7 +41,6 @@ end + module Make (H : HashedType) : S with type key = H.t + + val hash : 'a -> int +-external hash_param : int -> int -> 'a -> int = "caml_hash_univ_param" "noalloc" + + (** + additional functions +diff --git a/ocamllib/libbase/baseObj.mli b/ocamllib/libbase/baseObj.mli +index da2d973..5eb77b5 100644 +--- a/ocamllib/libbase/baseObj.mli ++++ b/ocamllib/libbase/baseObj.mli +@@ -23,7 +23,7 @@ external obj : t -> 'a = "%identity" + external magic : 'a -> 'b = "%identity" + external is_block : t -> bool = "caml_obj_is_block" + external is_int : t -> bool = "%obj_is_int" +-external tag : t -> int = "caml_obj_tag" ++external tag : t -> int = "caml_obj_tag" [@@noalloc] + external set_tag : t -> int -> unit = "caml_obj_set_tag" + external size : t -> int = "%obj_size" + external truncate : t -> int -> unit = "caml_obj_truncate" +@@ -49,9 +49,6 @@ val int_tag : int + val out_of_heap_tag : int + val unaligned_tag : int + +-val marshal : t -> string +-val unmarshal : string -> int -> t * int +- + (** Additional functions *) + + val dump : ?custom:(Obj.t -> (Buffer.t -> Obj.t -> unit) option) -> ?depth:int -> 'a -> string diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 387c96dd3d05..6558698b3154 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15575,7 +15575,7 @@ with pkgs; ocsigen-i18n = callPackage ../development/tools/ocaml/ocsigen-i18n { }; opa = callPackage ../development/compilers/opa { - ocamlPackages = ocaml-ng.ocamlPackages_4_05; + ocamlPackages = ocaml-ng.ocamlPackages_4_14_unsafe_string; }; opaline = callPackage ../development/tools/ocaml/opaline { }; From a8a12fdf8538e363846af8634b2a663595a8e686 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 02:08:38 +0000 Subject: [PATCH 104/174] erdtree: 1.2.0 -> 1.3.0 --- pkgs/tools/system/erdtree/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/erdtree/default.nix b/pkgs/tools/system/erdtree/default.nix index fd2ee51ad9be..1001fb7fdd69 100644 --- a/pkgs/tools/system/erdtree/default.nix +++ b/pkgs/tools/system/erdtree/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "erdtree"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "solidiquis"; repo = pname; rev = "v${version}"; - hash = "sha256-VSIeEyMFY10aHLCRmTh0EaGa08KPqrStsPLrssDT0TE="; + hash = "sha256-xPMOjhp4voT2Ad30WtAyA0MT917xt3Sd++KhLHmciA0="; }; - cargoHash = "sha256-0kDRrsiGJw4iv4CD3FRE4zIBfGO352vnp2KD1RiZafg="; + cargoHash = "sha256-euthKq/5X5bCxV8qAAHyMm4nPPSWCvGRCfx0a1kwr/c="; meta = with lib; { description = "File-tree visualizer and disk usage analyzer"; From 8648885a80194aea9fa20a699c260af357428a76 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 02:22:12 +0000 Subject: [PATCH 105/174] xc: 0.0.159 -> 0.0.175 --- pkgs/development/tools/xc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/xc/default.nix b/pkgs/development/tools/xc/default.nix index 8eb01e4dca09..9b4643435bac 100644 --- a/pkgs/development/tools/xc/default.nix +++ b/pkgs/development/tools/xc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "xc"; - version = "0.0.159"; + version = "0.0.175"; src = fetchFromGitHub { owner = "joerdav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5Vw/UStMtP5CHbSCOzeD4LMJccPG34Rxw9VHc9Ut3oM="; + sha256 = "sha256-Uc9MTxl32xQ7u6N0mocDAoD9tgv/YOPCzhonsavX9Vo="; }; - vendorHash = "sha256-XDJdCh6P8ScSvxY55ExKgkgFQqmBaM9fMAjAioEQ0+s="; + vendorHash = "sha256-cySflcTuAzbFZbtXmzZ98nfY8HUq1UedONTtKP4EICs="; meta = with lib; { homepage = "https://xcfile.dev/"; From 3d647935eb8341ff5d70ce0ef53e00891430fc39 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 02:39:08 +0000 Subject: [PATCH 106/174] ov: 0.14.2 -> 0.15.0 --- pkgs/tools/text/ov/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/ov/default.nix b/pkgs/tools/text/ov/default.nix index 55c66f7a5408..ab8db6fbea45 100644 --- a/pkgs/tools/text/ov/default.nix +++ b/pkgs/tools/text/ov/default.nix @@ -8,16 +8,16 @@ buildGoModule rec { pname = "ov"; - version = "0.14.2"; + version = "0.15.0"; src = fetchFromGitHub { owner = "noborus"; repo = "ov"; rev = "refs/tags/v${version}"; - hash = "sha256-tbJ3Es6huu+0HcpoiNpYLbxsm0QCWYZk6bX2MdQxT2I="; + hash = "sha256-gL2Gz7ziy6YfAiGuvyg7P9wUBST/Hy6/vmpQN9tdv3g="; }; - vendorHash = "sha256-EjLslvc0cgvD7LjuDa49h/qt6K4Z9DEtQjV/LYkKwKo="; + vendorHash = "sha256-BM9XnjAiX3qAukqwbl3Aij1scKU2+txx4SHC8aHaS/Q="; ldflags = [ "-X main.Version=v${version}" From bfb509e45c09585a5fb4c36032b5cfcab65ee9f4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Mar 2023 18:39:39 -0800 Subject: [PATCH 107/174] python310Packages.insteon-frontend-home-assistant: 0.3.2 -> 0.3.3 Changelog: https://github.com/pyinsteon/insteon-panel/releases/tag/0.3.3 --- .../insteon-frontend-home-assistant/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix index 6303ec76fe05..2d71334eadcb 100644 --- a/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix +++ b/pkgs/development/python-modules/insteon-frontend-home-assistant/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "insteon-frontend-home-assistant"; - version = "0.3.2"; + version = "0.3.3"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7jRf6fp+5u6qqR5xP1R+kp6LURsBVqfct6yuCkbxBMw="; + hash = "sha256-aZ10z7xCVWq4V2+jPCybFa5LKGhvtchrwgTVFfxhM+o="; }; nativeBuildInputs = [ From 61852b7faa8b47aad422adca0fea90fe007e9ead Mon Sep 17 00:00:00 2001 From: pennae Date: Fri, 24 Feb 2023 16:28:06 +0100 Subject: [PATCH 108/174] lib: remove deprecated functions all of these have been deprecated and raising warnings since 18.09. it's about time we actually made good on "will be removed in the next release". --- lib/debug.nix | 86 ------------------------------------------------- lib/default.nix | 9 +++--- 2 files changed, 4 insertions(+), 91 deletions(-) diff --git a/lib/debug.nix b/lib/debug.nix index 35ca4c7dfb20..a851cd74778c 100644 --- a/lib/debug.nix +++ b/lib/debug.nix @@ -250,90 +250,4 @@ rec { { testX = allTrue [ true ]; } */ testAllTrue = expr: { inherit expr; expected = map (x: true) expr; }; - - - # -- DEPRECATED -- - - traceShowVal = x: trace (showVal x) x; - traceShowValMarked = str: x: trace (str + showVal x) x; - - attrNamesToStr = a: - trace ( "Warning: `attrNamesToStr` is deprecated " - + "and will be removed in the next release. " - + "Please use more specific concatenation " - + "for your uses (`lib.concat(Map)StringsSep`)." ) - (concatStringsSep "; " (map (x: "${x}=") (attrNames a))); - - showVal = - trace ( "Warning: `showVal` is deprecated " - + "and will be removed in the next release, " - + "please use `traceSeqN`" ) - (let - modify = v: - let pr = f: { __pretty = f; val = v; }; - in if isDerivation v then pr - (drv: "<δ:${drv.name}:${concatStringsSep "," - (attrNames drv)}>") - else if [] == v then pr (const "[]") - else if isList v then pr (l: "[ ${go (head l)}, … ]") - else if isAttrs v then pr - (a: "{ ${ concatStringsSep ", " (attrNames a)} }") - else v; - go = x: generators.toPretty - { allowPrettyValues = true; } - (modify x); - in go); - - traceXMLVal = x: - trace ( "Warning: `traceXMLVal` is deprecated " - + "and will be removed in the next release. " - + "Please use `traceValFn builtins.toXML`." ) - (trace (builtins.toXML x) x); - traceXMLValMarked = str: x: - trace ( "Warning: `traceXMLValMarked` is deprecated " - + "and will be removed in the next release. " - + "Please use `traceValFn (x: str + builtins.toXML x)`." ) - (trace (str + builtins.toXML x) x); - - # trace the arguments passed to function and its result - # maybe rewrite these functions in a traceCallXml like style. Then one function is enough - traceCall = n: f: a: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a)); - traceCall2 = n: f: a: b: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b)); - traceCall3 = n: f: a: b: c: let t = n2: x: traceShowValMarked "${n} ${n2}:" x; in t "result" (f (t "arg 1" a) (t "arg 2" b) (t "arg 3" c)); - - traceValIfNot = c: x: - trace ( "Warning: `traceValIfNot` is deprecated " - + "and will be removed in the next release. " - + "Please use `if/then/else` and `traceValSeq 1`.") - (if c x then true else traceSeq (showVal x) false); - - - addErrorContextToAttrs = attrs: - trace ( "Warning: `addErrorContextToAttrs` is deprecated " - + "and will be removed in the next release. " - + "Please use `builtins.addErrorContext` directly." ) - (mapAttrs (a: v: addErrorContext "while evaluating ${a}" v) attrs); - - # example: (traceCallXml "myfun" id 3) will output something like - # calling myfun arg 1: 3 result: 3 - # this forces deep evaluation of all arguments and the result! - # note: if result doesn't evaluate you'll get no trace at all (FIXME) - # args should be printed in any case - traceCallXml = a: - trace ( "Warning: `traceCallXml` is deprecated " - + "and will be removed in the next release. " - + "Please complain if you use the function regularly." ) - (if !isInt a then - traceCallXml 1 "calling ${a}\n" - else - let nr = a; - in (str: expr: - if isFunction expr then - (arg: - traceCallXml (builtins.add 1 nr) "${str}\n arg ${builtins.toString nr} is \n ${builtins.toXML (builtins.seq arg arg)}" (expr arg) - ) - else - let r = builtins.seq expr expr; - in trace "${str}\n result:\n${builtins.toXML r}" r - )); } diff --git a/lib/default.nix b/lib/default.nix index 7948dbd5a1ef..85303e0a5abf 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -145,11 +145,10 @@ let isOptionType mkOptionType; inherit (self.asserts) assertMsg assertOneOf; - inherit (self.debug) addErrorContextToAttrs traceIf traceVal traceValFn - traceXMLVal traceXMLValMarked traceSeq traceSeqN traceValSeq - traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN traceShowVal - traceShowValMarked showVal traceCall traceCall2 traceCall3 - traceValIfNot runTests testAllTrue traceCallXml attrNamesToStr; + inherit (self.debug) traceIf traceVal traceValFn + traceSeq traceSeqN traceValSeq + traceValSeqFn traceValSeqN traceValSeqNFn traceFnSeqN + runTests testAllTrue; inherit (self.misc) maybeEnv defaultMergeArg defaultMerge foldArgs maybeAttrNullable maybeAttr ifEnable checkFlag getValue checkReqs uniqList uniqListExt condConcat lazyGenericClosure From 194a380161f12b7b720d25527b06292b715ddaf2 Mon Sep 17 00:00:00 2001 From: SharzyL Date: Wed, 8 Mar 2023 11:20:55 +0800 Subject: [PATCH 109/174] nexttrace: init at 1.1.3 --- pkgs/tools/networking/nexttrace/default.nix | 30 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/networking/nexttrace/default.nix diff --git a/pkgs/tools/networking/nexttrace/default.nix b/pkgs/tools/networking/nexttrace/default.nix new file mode 100644 index 000000000000..931c229ae3aa --- /dev/null +++ b/pkgs/tools/networking/nexttrace/default.nix @@ -0,0 +1,30 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "nexttrace"; + version = "1.1.3"; + + src = fetchFromGitHub { + owner = "sjlleo"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-sOTQBh6j8od24s36J0e2aKW1mWmAD/ThfY6pd1SsSlY="; + }; + vendorHash = "sha256-ckGoDV4GNp0mG+bkCKoLBO+ap53R5zrq/ZSKiFmVf9U="; + + doCheck = false; # Tests require a network connection. + + ldflags = [ + "-s" + "-w" + "-X github.com/xgadget-lab/nexttrace/printer.version=v${version}" + ]; + + meta = with lib; { + description = "An open source visual route tracking CLI tool"; + homepage = "https://mtr.moe"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ sharzy ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4e545c2a710b..ae25c97d6ae7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5317,6 +5317,8 @@ with pkgs; nextdns = callPackage ../applications/networking/nextdns { }; + nexttrace = callPackage ../tools/networking/nexttrace { }; + ngadmin = callPackage ../applications/networking/ngadmin { }; nfdump = callPackage ../tools/networking/nfdump { }; From 5e651fe37e98c69121609146ad5240663d0387df Mon Sep 17 00:00:00 2001 From: SharzyL Date: Wed, 8 Mar 2023 11:21:06 +0800 Subject: [PATCH 110/174] nixos/nexttrace: init --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/nexttrace.nix | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 nixos/modules/programs/nexttrace.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index de390d801478..2b046d19d758 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -205,6 +205,7 @@ ./programs/nbd.nix ./programs/neovim.nix ./programs/nethoscope.nix + ./programs/nexttrace.nix ./programs/nix-index.nix ./programs/nix-ld.nix ./programs/nm-applet.nix diff --git a/nixos/modules/programs/nexttrace.nix b/nixos/modules/programs/nexttrace.nix new file mode 100644 index 000000000000..091d4f17f9f6 --- /dev/null +++ b/nixos/modules/programs/nexttrace.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +let + cfg = config.programs.nexttrace; + +in +{ + options = { + programs.nexttrace = { + enable = lib.mkEnableOption (lib.mdDoc "Nexttrace to the global environment and configure a setcap wrapper for it"); + package = lib.mkPackageOptionMD pkgs "nexttrace" { }; + }; + }; + + config = lib.mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; + + security.wrappers.nexttrace = { + owner = "root"; + group = "root"; + capabilities = "cap_net_raw,cap_net_admin+eip"; + source = "${cfg.package}/bin/nexttrace"; + }; + }; +} From d1ffbed1759054328af3c06a6f49c4e6996bfb7d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 03:50:54 +0000 Subject: [PATCH 111/174] qcad: 3.27.9.2 -> 3.27.9.3 --- pkgs/applications/misc/qcad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qcad/default.nix b/pkgs/applications/misc/qcad/default.nix index c630ce06b59b..c5791c1a1c89 100644 --- a/pkgs/applications/misc/qcad/default.nix +++ b/pkgs/applications/misc/qcad/default.nix @@ -18,14 +18,14 @@ mkDerivation rec { pname = "qcad"; - version = "3.27.9.2"; + version = "3.27.9.3"; src = fetchFromGitHub { name = "qcad-${version}-src"; owner = "qcad"; repo = "qcad"; rev = "v${version}"; - sha256 = "sha256-RpyckKXU8WN/bptKp6G5gNVSU3RzNFYnM0eWLf3E2Yg="; + sha256 = "sha256-JEUV8TtVYSlO+Gmg/ktMTmTlOmH+2zc6/fLkVHD7eBc="; }; patches = [ From 392c79dece5491dd62471da85df6adec1edcd29c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:12:20 +0000 Subject: [PATCH 112/174] =?UTF-8?q?terraform-providers.aviatrix:=203.0.1?= =?UTF-8?q?=20=E2=86=92=203.0.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a9963b0f2eb3..ec798456aa78 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -101,11 +101,11 @@ "vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw=" }, "aviatrix": { - "hash": "sha256-jZXTsCa1TDwdOFGJKX4xM3sB0zfix5nTBuBdBGtwOOs=", + "hash": "sha256-vlDpubfBnNPFsU/kJl7GpSH4SKs1CDlgPVlPnCBb/lM=", "homepage": "https://registry.terraform.io/providers/AviatrixSystems/aviatrix", "owner": "AviatrixSystems", "repo": "terraform-provider-aviatrix", - "rev": "v3.0.1", + "rev": "v3.0.2", "spdx": "MPL-2.0", "vendorHash": null }, From 35ebb2dc8341d34b01e5cf5092c29af180925391 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:12:47 +0000 Subject: [PATCH 113/174] =?UTF-8?q?terraform-providers.aiven:=204.0.0=20?= =?UTF-8?q?=E2=86=92=204.1.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index ec798456aa78..115f807d1aae 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -28,11 +28,11 @@ "vendorHash": "sha256-jK7JuARpoxq7hvq5+vTtUwcYot0YqlOZdtDwq4IqKvk=" }, "aiven": { - "hash": "sha256-ahqp63zzO4+TvdXk2e4r3r0VG7Cys3lhE+wkEkjN+vI=", + "hash": "sha256-InYRBUjOJ29dbnXTcz/ErPhEMyRdKn+YxHrAyBZNLdo=", "homepage": "https://registry.terraform.io/providers/aiven/aiven", "owner": "aiven", "repo": "terraform-provider-aiven", - "rev": "v4.0.0", + "rev": "v4.1.0", "spdx": "MIT", "vendorHash": "sha256-VAYCx0DHG+J8zzYFP2UyZ+W6cOgi8G+PQktEBOWbjSk=" }, From 5f93b9774eb22fc13275d89a081a0acc14a82ca9 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:14:42 +0000 Subject: [PATCH 114/174] =?UTF-8?q?terraform-providers.cloudfoundry:=200.5?= =?UTF-8?q?0.4=20=E2=86=92=200.50.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 115f807d1aae..f6988361e895 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -228,13 +228,13 @@ "vendorHash": "sha256-jIQcgGknigQFUkLjLoxUjq+Mqjb085v6Zqgd49Dxivo=" }, "cloudfoundry": { - "hash": "sha256-/Zxj9cous0SjYxeDo+8/u61pqDwMGt/UsS/OC1oSR2U=", + "hash": "sha256-Js/UBblHkCkfaBVOpYFGyrleOjpNE1mo+Sf3OpXLkfM=", "homepage": "https://registry.terraform.io/providers/cloudfoundry-community/cloudfoundry", "owner": "cloudfoundry-community", "repo": "terraform-provider-cloudfoundry", - "rev": "v0.50.4", + "rev": "v0.50.5", "spdx": "MPL-2.0", - "vendorHash": "sha256-mEWhLh4E3SI7xfmal1sJ5PdAYbYJrW/YFoBjTW9w4bA=" + "vendorHash": "sha256-2ulAzgDBdcYTqGRmEL9+h9MglZ9bt5WRXzNP099g2kk=" }, "cloudinit": { "hash": "sha256-fdtUKD8XC1Y72IzrsCfTZYVYZwLqY3gV2sajiw4Krzw=", From c242f5c89d42cef004ea0f8d155121b848b5b764 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:14:46 +0000 Subject: [PATCH 115/174] =?UTF-8?q?terraform-providers.cloudamqp:=201.23.0?= =?UTF-8?q?=20=E2=86=92=201.24.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index f6988361e895..8665b61f087b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -210,13 +210,13 @@ "vendorHash": null }, "cloudamqp": { - "hash": "sha256-xua8ZJjc+y6bzF/I2N752Cv22XAXvOjrH9Du1TdipM0=", + "hash": "sha256-gUOWUvdlmn+u6IL6UrzA8MKErl43VmtIqnilzUTKuis=", "homepage": "https://registry.terraform.io/providers/cloudamqp/cloudamqp", "owner": "cloudamqp", "repo": "terraform-provider-cloudamqp", - "rev": "v1.23.0", + "rev": "v1.24.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-PALZGyGZ6Ggccl4V9gG+gsEdNipYG+DCaZkqF0W1IMQ=" + "vendorHash": "sha256-V5nI7B45VJb7j7AoPrKQknJbVW5C9oyDs9q2u8LXD+M=" }, "cloudflare": { "hash": "sha256-fHugf+nvel/bSyh+l94q0iE7E+ZYBt2qfGSoot9xI8w=", From 54c038d693d78fec48eb45ad34c6df14e5907f9c Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:16:40 +0000 Subject: [PATCH 116/174] =?UTF-8?q?terraform-providers.datadog:=203.21.0?= =?UTF-8?q?=20=E2=86=92=203.22.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 8665b61f087b..d7723b5f9676 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -283,13 +283,13 @@ "vendorHash": "sha256-QlmVrcC1ctjAHOd7qsqc9gpqttKplEy4hlT++cFUZfM=" }, "datadog": { - "hash": "sha256-gZdjbW2yz3TmnGfCLiveUpTcMeKBUUSV6CnugnkdoZ8=", + "hash": "sha256-7z7NjQ6JBZOCEn8ZiyrgiAlzbzWpzNEhveydBmh841E=", "homepage": "https://registry.terraform.io/providers/DataDog/datadog", "owner": "DataDog", "repo": "terraform-provider-datadog", - "rev": "v3.21.0", + "rev": "v3.22.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6aBwtm4p/sJyH9jT7wT+utHIlOSgOilOk0AZSI9RzD8=" + "vendorHash": "sha256-2cv7ffNuis91C2iUaYqq5uKx7wwpi2ohwU1q7wjurbA=" }, "dhall": { "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", From 59d19cf0a1e47595f4f38db20c00df5c7ef1db80 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:18:36 +0000 Subject: [PATCH 117/174] =?UTF-8?q?terraform-providers.okta:=203.42.0=20?= =?UTF-8?q?=E2=86=92=203.43.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index d7723b5f9676..2bf0022822e6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -820,13 +820,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-UMQ1YEXYdaLwYZBhGzbikhExW/HT/u4QSNk08vhmbwA=", + "hash": "sha256-3Ym2Q3Y2f26ioiB3N2HZiPsrgVe4zszJDR7e0gzxOHU=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.42.0", + "rev": "v3.43.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-KWSHVI51YHHF3HXpyd1WB5Za721ak+cFhwDIfvC/ax4=" + "vendorHash": "sha256-7jA44ZcBGCeLrr+On8F9er+ch2qf6vbijTRtu+aHrB4=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 75725216fd4480420f45ff0437ca408965e7ea93 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:18:40 +0000 Subject: [PATCH 118/174] =?UTF-8?q?terraform-providers.mongodbatlas:=201.8?= =?UTF-8?q?.0=20=E2=86=92=201.8.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2bf0022822e6..207245103f2b 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -738,13 +738,13 @@ "vendorHash": "sha256-MLhHRMahJjTgQBzYkSaVv6wFm6b+YgpkitBHuj5B6po=" }, "mongodbatlas": { - "hash": "sha256-OR9bvtg3DoJ4hFP/iqzQ1cFwWZYrUrzykN6sycd0Z6o=", + "hash": "sha256-HkY2X6EbgObgXH2jLhQ96edlxMHytSGfXETQ5oXPI6M=", "homepage": "https://registry.terraform.io/providers/mongodb/mongodbatlas", "owner": "mongodb", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.8.0", + "rev": "v1.8.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-cvTIFjKYrIohRjUTxGOxgla2t/elj3Aw79kbVdaQbrY=" + "vendorHash": "sha256-/DQsnKuRHO/SUyL+mCDP619iHLtWanqNyZkB2ryLSaA=" }, "namecheap": { "hash": "sha256-cms8YUL+SjTeYyIOQibksi8ZHEBYq2JlgTEpOO1uMZE=", From 2369bf3d444bfd84a8b31e28ca867618e81d0077 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:20:30 +0000 Subject: [PATCH 119/174] =?UTF-8?q?terraform-providers.scaleway:=202.12.0?= =?UTF-8?q?=20=E2=86=92=202.12.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 207245103f2b..0056e3139ed8 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -964,13 +964,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-rkDNV58mN/7pgQC1WBnrggHtq7q3O7r3v+huB4oPVLM=", + "hash": "sha256-gscuuaohIOIdDAAUWKg82fm9iY51ZxoN4EeAxAzTvjI=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.12.0", + "rev": "v2.12.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-zice1rGuZH9kmQJQ8RdIONJXVXu1BIuRUKjTGLPK7Ns=" + "vendorHash": "sha256-kh1wv7cuWCC1rP0WBQW95pFg53gZTakqGoMIDMDSmt0=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From 1599fe767a9636c79b431420a20e0bf44f7e6787 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 8 Mar 2023 03:22:45 +0000 Subject: [PATCH 120/174] =?UTF-8?q?terraform-providers.yandex:=200.85.0=20?= =?UTF-8?q?=E2=86=92=200.86.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 0056e3139ed8..8ac7cd692ee6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1254,13 +1254,13 @@ "vendorHash": "sha256-ib1Esx2AO7b9S+v+zzuATgSVHI3HVwbzEeyqhpBz1BQ=" }, "yandex": { - "hash": "sha256-aBWcxC6mHM/3GOjnN/Qi0DNoZjehh5i3C2+XRZ2Igdo=", + "hash": "sha256-0P8R0L5PGrDKWGd92OkKi9WCfMK5IrdYJyoINaZWZjc=", "homepage": "https://registry.terraform.io/providers/yandex-cloud/yandex", "owner": "yandex-cloud", "proxyVendor": true, "repo": "terraform-provider-yandex", - "rev": "v0.85.0", + "rev": "v0.86.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-eLCFnBGAvH0ZEzOb5xVCY0Yy4U5V407AhpGSFpa9t7I=" + "vendorHash": "sha256-r2+ARKvTghscGBhmZpz84vdBudiy2OsmQR03oDz5gbs=" } } From 76c0e3ef55c937f83bbe6ba6543d430d7e6412a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 7 Mar 2023 20:22:38 -0800 Subject: [PATCH 121/174] python310Packages.klein: don't test on multiple cores Tests time out otherwise. --- pkgs/development/python-modules/klein/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/klein/default.nix b/pkgs/development/python-modules/klein/default.nix index 0fda816533cf..641388fbdd57 100644 --- a/pkgs/development/python-modules/klein/default.nix +++ b/pkgs/development/python-modules/klein/default.nix @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; checkPhase = '' - ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES klein + ${python.interpreter} -m twisted.trial klein ''; pythonImportsCheck = [ From fb8251822c6236d95629cfc4800f5eea9ee9932b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 4 Mar 2023 09:15:58 -0800 Subject: [PATCH 122/174] libadwaita: 1.2.2 -> 1.2.3 Diff: https://gitlab.gnome.org/GNOME/libadwaita/-/compare/1.2.2...1.2.3 Changelog: https://gitlab.gnome.org/GNOME/libadwaita/-/blob/1.2.3/NEWS --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index d6917fe7f2da..75e70ff1dddc 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.2.2"; + version = "1.2.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-ftq7PLbTmhAAAhAYfrwicWn8t88+dG45G8q/vQa2cKw="; + hash = "sha256-m69TpXCs6QpVrN+6auig71ik+HvVprHi0OnlyDwTL7U="; }; depsBuildBuild = [ From b6b23791f51d1df6416d9ae713af57ccc8ff271b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 05:56:59 +0000 Subject: [PATCH 123/174] pachyderm: 2.5.0 -> 2.5.1 --- pkgs/applications/networking/cluster/pachyderm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/pachyderm/default.nix b/pkgs/applications/networking/cluster/pachyderm/default.nix index 029e23330335..800d34bda30e 100644 --- a/pkgs/applications/networking/cluster/pachyderm/default.nix +++ b/pkgs/applications/networking/cluster/pachyderm/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pachyderm"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "pachyderm"; repo = "pachyderm"; rev = "v${version}"; - hash = "sha256-Gm/aUkwEbWxj76Q6My1Vw2gRn3+WVG6EJ7PLpQ1F130="; + hash = "sha256-HFIDss01nxBoRQI+Hu8Q02pnIg4DWe7XROl0Z33oubI="; }; vendorHash = "sha256-MVcbeQ4qAX9zVlT81yZd5xvo1ggVNpCZJozBoql2W9o="; From f7f6256de8c51bb4aaec38792ef5d93853703ab4 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 8 Mar 2023 01:03:29 -0500 Subject: [PATCH 124/174] ytt: 0.44.1 -> 0.45.0 --- pkgs/development/tools/ytt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ytt/default.nix b/pkgs/development/tools/ytt/default.nix index 8e33b84b364e..4bb1572cdbe5 100644 --- a/pkgs/development/tools/ytt/default.nix +++ b/pkgs/development/tools/ytt/default.nix @@ -1,13 +1,13 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "ytt"; - version = "0.44.1"; + version = "0.45.0"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-ytt"; rev = "v${version}"; - sha256 = "sha256-3uyMwW8v2rPguXbPKy8IyQxroNaNS6rrXEcgRP91fdU="; + sha256 = "sha256-G8rQEDVTv3e5YFwKSL7Rd1Is1kjBl08DL4Kl6H8aa68="; }; vendorSha256 = null; From 41ec7e2fefb0c3b8942cbfc47e579a052bdc5c49 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 08:06:25 +0100 Subject: [PATCH 125/174] python3Packages.sphinxext-opengraph: add changelog to meta --- pkgs/development/python-modules/sphinxext-opengraph/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 5058fc82ff88..7fd4973c0ed4 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -40,6 +40,7 @@ buildPythonPackage rec { meta = with lib; { description = "Sphinx extension to generate unique OpenGraph metadata"; homepage = "https://github.com/wpilibsuite/sphinxext-opengraph"; + changelog = "https://github.com/wpilibsuite/sphinxext-opengraph/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ Luflosi ]; }; From a35b09be82e3ecd237791f32a93e9b681ffd553e Mon Sep 17 00:00:00 2001 From: zendo Date: Wed, 8 Mar 2023 15:21:45 +0800 Subject: [PATCH 126/174] audacious: 4.2 -> 4.3 --- pkgs/applications/audio/audacious/default.nix | 4 ++-- pkgs/applications/audio/audacious/plugins.nix | 8 ++++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index eb404041d973..19b347ab459c 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "audacious"; - version = "4.2"; + version = "4.3"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "sha256-/rME5HCkgf4rPEyhycs7I+wmJUDBLQ0ebCKl62JeBLM="; + sha256 = "sha256-J1hNyEXH5w24ySZ5kJRfFzIqHsyA/4tFLpypFqDOkJE="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/audio/audacious/plugins.nix b/pkgs/applications/audio/audacious/plugins.nix index 902140465334..bd9bb5149747 100644 --- a/pkgs/applications/audio/audacious/plugins.nix +++ b/pkgs/applications/audio/audacious/plugins.nix @@ -35,6 +35,8 @@ , neon , ninja , pkg-config +, opusfile +, pipewire , qtbase , qtmultimedia , qtx11extras @@ -44,11 +46,11 @@ stdenv.mkDerivation rec { pname = "audacious-plugins"; - version = "4.2"; + version = "4.3"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "sha256-b6D2nDoQQeuHfDcQlROrSioKVqd9nowToVgc8UOaQX8="; + sha256 = "sha256-Zi72yMS9cNDzX9HF8IuRVJuUNmOLZfihozlWsJ34n8Y="; }; patches = [ ./0001-Set-plugindir-to-PREFIX-lib-audacious.patch ]; @@ -91,6 +93,8 @@ stdenv.mkDerivation rec { lirc mpg123 neon + opusfile + pipewire qtbase qtmultimedia qtx11extras From d7a0fc6e764f1a8cca6532a97b3d228c1f6bec90 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 08:23:24 +0100 Subject: [PATCH 127/174] amass: 3.21.2 -> 3.22.0 Diff: https://github.com/OWASP/Amass/compare/v3.21.2...v3.22.0 Changelog: https://github.com/OWASP/Amass/releases/tag/v3.22.0 --- pkgs/tools/networking/amass/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/amass/default.nix b/pkgs/tools/networking/amass/default.nix index 6106ae16c4a8..a9da1417c9fa 100644 --- a/pkgs/tools/networking/amass/default.nix +++ b/pkgs/tools/networking/amass/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "amass"; - version = "3.21.2"; + version = "3.22.0"; src = fetchFromGitHub { owner = "OWASP"; repo = "Amass"; rev = "v${version}"; - hash = "sha256-s5+l5LBDUPhKkP1+m0R2UXywBX0y+4FWtyYP5F7ccaQ="; + hash = "sha256-ph5SYN91/ibZdAAA/SZt7lecZCC93uotjfzkI4erzgU="; }; - vendorHash = "sha256-Syi+znSXxjxfD9gqAyqhksWmxuNkwialWaem1NE5MKQ="; + vendorHash = "sha256-fZd++VsLcs3MzcM23zE3AVaDPXf+cuLdJp8hsCeEZ1Y="; outputs = [ "out" From c1d9d8c7f3e99af8f475730c79cb2ad25b52558e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 08:28:03 +0100 Subject: [PATCH 128/174] exploitdb: 2023-03-01 -> 2023-03-06 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index b5b4e1454c30..9aa32572d60a 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2023-03-01"; + version = "2023-03-06"; src = fetchFromGitLab { owner = "exploit-database"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-+1yu5R3JUmp6PylmkIWZlEXlq05fi9Lb1q36iBPWdso="; + hash = "sha256-5ieCbYpQqL7+wYDJzGrnH8KWNOGvSQWkhUcIkXOhVo0="; }; nativeBuildInputs = [ From 2a508fbf2c3bfd4130d7390b6ff9b1b29ccbbc44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 08:43:59 +0100 Subject: [PATCH 129/174] python310Packages.sphinxext-opengraph: disable on unsupported Python releases --- .../python-modules/sphinxext-opengraph/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/sphinxext-opengraph/default.nix b/pkgs/development/python-modules/sphinxext-opengraph/default.nix index 7fd4973c0ed4..4109e513dd35 100644 --- a/pkgs/development/python-modules/sphinxext-opengraph/default.nix +++ b/pkgs/development/python-modules/sphinxext-opengraph/default.nix @@ -4,6 +4,7 @@ , sphinx , matplotlib , pytestCheckHook +, pythonOlder , beautifulsoup4 , setuptools-scm }: @@ -11,6 +12,9 @@ buildPythonPackage rec { pname = "sphinxext-opengraph"; version = "0.8.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "wpilibsuite"; From d6e7f3fc7b72a1e9a7616fcd378f4dcfb35cfb9e Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Wed, 8 Mar 2023 13:17:41 +0530 Subject: [PATCH 130/174] rmw: init at 0.9.0 --- pkgs/tools/misc/rmw/default.nix | 39 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/misc/rmw/default.nix diff --git a/pkgs/tools/misc/rmw/default.nix b/pkgs/tools/misc/rmw/default.nix new file mode 100644 index 000000000000..1d97319af983 --- /dev/null +++ b/pkgs/tools/misc/rmw/default.nix @@ -0,0 +1,39 @@ +{ lib +, stdenv +, fetchFromGitHub +, meson +, ninja +, pkg-config +, ncurses +}: + +stdenv.mkDerivation rec { + pname = "rmw"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "theimpossibleastronaut"; + repo = "rmw"; + rev = "v${version}"; + hash = "sha256-KOYj63j/vCG7I63bgep03HzufOj/p/EHaY8lyRMHCkY="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + pkg-config + meson + ninja + ]; + + buildInputs = [ + ncurses + ]; + + meta = with lib; { + description = "Trashcan/ recycle bin utility for the command line"; + homepage = "https://github.com/theimpossibleastronaut/rmw"; + changelog = "https://github.com/theimpossibleastronaut/rmw/blob/${src.rev}/ChangeLog"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d7ef5990946f..315c1a84de9c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11665,6 +11665,8 @@ with pkgs; inherit (python3Packages) sphinx; }; + rmw = callPackage ../tools/misc/rmw { }; + rng-tools = callPackage ../tools/security/rng-tools { }; rnnoise = callPackage ../development/libraries/rnnoise { }; From 60709908a27fa813022c10838908c979b291ca4c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Wed, 8 Mar 2023 10:23:00 +0200 Subject: [PATCH 131/174] ocaml: remove obsolete aliases for old versions --- pkgs/top-level/aliases.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 9d82d78b42cd..367001940416 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -1726,17 +1726,8 @@ mapAliases ({ # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03 # branch-off - ocamlPackages_4_00_1 = throw "'ocamlPackages_4_00_1' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1'"; # Converted to throw 2022-02-22 - ocamlPackages_4_01_0 = throw "'ocamlPackages_4_01_0' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0'"; # Converted to throw 2022-02-22 - ocamlPackages_4_02 = throw "'ocamlPackages_4_02' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02'"; # Converted to throw 2022-02-22 - ocamlPackages_4_03 = throw "'ocamlPackages_4_03' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03'"; # Converted to throw 2022-02-22 ocamlPackages_latest = throw "'ocamlPackages_latest' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_latest'"; # Converted to throw 2022-02-22 - ocaml_4_00_1 = throw "'ocamlPackages_4_00_1.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_00_1.ocaml'"; # Converted to throw 2022-02-22 - ocaml_4_01_0 = throw "'ocamlPackages_4_01_0.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_01_0.ocaml'"; # Converted to throw 2022-02-22 - ocaml_4_02 = throw "'ocamlPackages_4_02.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_02.ocaml'"; # Converted to throw 2022-02-22 - ocaml_4_03 = throw "'ocamlPackages_4_03.ocaml' has been renamed to/replaced by 'ocaml-ng.ocamlPackages_4_03.ocaml'"; # Converted to throw 2022-02-22 - ocamlformat_0_11_0 = throw "ocamlformat_0_11_0 has been removed in favor of newer versions"; # Added 2022-06-01 ocamlformat_0_12 = throw "ocamlformat_0_12 has been removed in favor of newer versions"; # Added 2022-06-01 ocamlformat_0_13_0 = throw "ocamlformat_0_13_0 has been removed in favor of newer versions"; # Added 2022-06-01 From 3d37d1bcc22837edfe18874a3fe83db6b981bb5c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 09:34:56 +0100 Subject: [PATCH 132/174] python310Packages.aioslimproto: 2.1.1 -> 2.2.0 Diff: https://github.com/home-assistant-libs/aioslimproto/compare/refs/tags/2.1.1...2.2.0 --- pkgs/development/python-modules/aioslimproto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 59dca9a34670..8a5bb023e7f3 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioslimproto"; - version = "2.1.1"; + version = "2.2.0"; format = "setuptools"; disabled = pythonOlder "3.9"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-Er7UsJDBDXD8CQSkUIOeO78HQaCsrRycU18LOjBpv/w="; + hash = "sha256-3aLAAUaoGkdzjUHFb6aiyVv0fzO8DojN0Y3DTf6h2Ow="; }; nativeCheckInputs = [ From 410dfd651a828131ee0cd6f9a043310b07539db5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 8 Mar 2023 09:37:16 +0100 Subject: [PATCH 133/174] python310Packages.aioslimproto: add changelog to meta --- pkgs/development/python-modules/aioslimproto/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/python-modules/aioslimproto/default.nix b/pkgs/development/python-modules/aioslimproto/default.nix index 8a5bb023e7f3..c790d12b1bfa 100644 --- a/pkgs/development/python-modules/aioslimproto/default.nix +++ b/pkgs/development/python-modules/aioslimproto/default.nix @@ -35,6 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Module to control Squeezebox players"; homepage = "https://github.com/home-assistant-libs/aioslimproto"; + changelog = "https://github.com/home-assistant-libs/aioslimproto/releases/tag/${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; From ffcf148a8dd6e8d1e240137e3f8071af5fa92a28 Mon Sep 17 00:00:00 2001 From: rewine Date: Wed, 1 Mar 2023 11:00:01 +0800 Subject: [PATCH 134/174] nixos/waybar: allow change waybar package to use also add waybar package to environment.systemPackages --- nixos/modules/programs/waybar.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/waybar.nix b/nixos/modules/programs/waybar.nix index 4697d0f7a622..2c49ae140813 100644 --- a/nixos/modules/programs/waybar.nix +++ b/nixos/modules/programs/waybar.nix @@ -2,17 +2,22 @@ with lib; +let + cfg = config.programs.waybar; +in { options.programs.waybar = { enable = mkEnableOption (lib.mdDoc "waybar"); + package = mkPackageOptionMD pkgs "waybar" { }; }; - config = mkIf config.programs.waybar.enable { + config = mkIf cfg.enable { + environment.systemPackages = [ cfg.package ]; systemd.user.services.waybar = { description = "Waybar as systemd service"; wantedBy = [ "graphical-session.target" ]; partOf = [ "graphical-session.target" ]; - script = "${pkgs.waybar}/bin/waybar"; + script = "${cfg.package}/bin/waybar"; }; }; From 26e14e57af344f61d8adc37ce4f6f1fe554861bc Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 27 Feb 2023 16:49:04 +0100 Subject: [PATCH 135/174] nixos/networkd-dispatcher: add rules option --- .../networking/networkd-dispatcher.nix | 87 +++++++++++++------ 1 file changed, 61 insertions(+), 26 deletions(-) diff --git a/nixos/modules/services/networking/networkd-dispatcher.nix b/nixos/modules/services/networking/networkd-dispatcher.nix index d13ca23368c5..c5319ca7b88a 100644 --- a/nixos/modules/services/networking/networkd-dispatcher.nix +++ b/nixos/modules/services/networking/networkd-dispatcher.nix @@ -3,8 +3,11 @@ with lib; let + cfg = config.services.networkd-dispatcher; + in { + options = { services.networkd-dispatcher = { @@ -14,14 +17,49 @@ in { for usage. ''); - scriptDir = mkOption { - type = types.path; - default = "/var/lib/networkd-dispatcher"; - description = mdDoc '' - This directory is used for keeping various scripts read and run by - networkd-dispatcher. See [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) - for directory structure and script usage. + rules = mkOption { + default = {}; + example = lib.literalExpression '' + { "restart-tor" = { + onState = ["routable" "off"]; + script = ''' + #!''${pkgs.runtimeShell} + if [[ $IFACE == "wlan0" && $AdministrativeState == "configured" ]]; then + echo "Restarting Tor ..." + systemctl restart tor + fi + exit 0 + '''; + }; + }; ''; + description = lib.mdDoc '' + Declarative configuration of networkd-dispatcher rules. See + [https://gitlab.com/craftyguy/networkd-dispatcher](upstream instructions) + for an introduction and example scripts. + ''; + type = types.attrsOf (types.submodule { + options = { + onState = mkOption { + type = types.listOf (types.enum [ + "routable" "dormant" "no-carrier" "off" "carrier" "degraded" + "configuring" "configured" + ]); + default = null; + description = lib.mdDoc '' + List of names of the systemd-networkd operational states which + should trigger the script. See + for a description of the specific state type. + ''; + }; + script = mkOption { + type = types.lines; + description = lib.mdDoc '' + Shell commands executed on specified operational states. + ''; + }; + }; + }); }; }; @@ -30,34 +68,31 @@ in { config = mkIf cfg.enable { systemd = { - packages = [ pkgs.networkd-dispatcher ]; services.networkd-dispatcher = { wantedBy = [ "multi-user.target" ]; # Override existing ExecStart definition - serviceConfig.ExecStart = [ + serviceConfig.ExecStart = let + scriptDir = pkgs.symlinkJoin { + name = "networkd-dispatcher-script-dir"; + paths = lib.mapAttrsToList (name: cfg: + (map(state: + pkgs.writeTextFile { + inherit name; + text = cfg.script; + destination = "/${state}.d/${name}"; + executable = true; + } + ) cfg.onState) + ) cfg.rules; + }; + in [ "" - "${pkgs.networkd-dispatcher}/bin/networkd-dispatcher -v --script-dir ${cfg.scriptDir} $networkd_dispatcher_args" + "${pkgs.networkd-dispatcher}/bin/networkd-dispatcher -v --script-dir ${scriptDir} $networkd_dispatcher_args" ]; }; - - # Directory structure required according to upstream instructions - # https://gitlab.com/craftyguy/networkd-dispatcher - tmpfiles.rules = [ - "d '${cfg.scriptDir}' 0750 root root - -" - "d '${cfg.scriptDir}/routable.d' 0750 root root - -" - "d '${cfg.scriptDir}/dormant.d' 0750 root root - -" - "d '${cfg.scriptDir}/no-carrier.d' 0750 root root - -" - "d '${cfg.scriptDir}/off.d' 0750 root root - -" - "d '${cfg.scriptDir}/carrier.d' 0750 root root - -" - "d '${cfg.scriptDir}/degraded.d' 0750 root root - -" - "d '${cfg.scriptDir}/configuring.d' 0750 root root - -" - "d '${cfg.scriptDir}/configured.d' 0750 root root - -" - ]; - }; - }; } From 22fd05adeeae38dd23be4b4c0ffb18f3f1fd264c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 3 Mar 2023 19:31:18 +0100 Subject: [PATCH 136/174] networkd-dispatcher: Add patch support store files --- .../networking/networkd-dispatcher/default.nix | 6 ++++++ .../support_nix_store_path.patch | 13 +++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch diff --git a/pkgs/tools/networking/networkd-dispatcher/default.nix b/pkgs/tools/networking/networkd-dispatcher/default.nix index b8812cb678de..161772ed4819 100644 --- a/pkgs/tools/networking/networkd-dispatcher/default.nix +++ b/pkgs/tools/networking/networkd-dispatcher/default.nix @@ -19,6 +19,12 @@ stdenv.mkDerivation rec { hash = "sha256-yO9/HlUkaQmW/n9N3vboHw//YMzBjxIHA2zAxgZNEv0="; }; + patches = [ + # Support rule files in NixOS store paths. Required for the networkd-dispatcher + # module to work + ./support_nix_store_path.patch + ]; + postPatch = '' # Fix paths in systemd unit file substituteInPlace networkd-dispatcher.service \ diff --git a/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch b/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch new file mode 100644 index 000000000000..6d32548f1883 --- /dev/null +++ b/pkgs/tools/networking/networkd-dispatcher/support_nix_store_path.patch @@ -0,0 +1,13 @@ +diff --git a/networkd-dispatcher b/networkd-dispatcher +index ef877ce..8c341f2 100755 +--- a/networkd-dispatcher ++++ b/networkd-dispatcher +@@ -171,6 +171,8 @@ def check_perms(path, mode=0o755, uid=0, gid=0): + + if not os.path.exists(path): + raise FileNotFoundError ++ if re.search('^/nix/store/.*', str(path)): ++ return True + st = os.stat(path, follow_symlinks=False) + st_mode = st.st_mode & 0x00FFF + if st.st_uid == uid and st.st_gid == gid and st_mode == mode: From d1323857f853e14b4f45a6f18ae9907065653aff Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Wed, 8 Mar 2023 13:20:12 +0400 Subject: [PATCH 137/174] =?UTF-8?q?tilemaker:=202.2.0=20=E2=86=92=202.3.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/misc/tilemaker/default.nix | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/tilemaker/default.nix b/pkgs/applications/misc/tilemaker/default.nix index a158badc8843..de5a7490f5c0 100644 --- a/pkgs/applications/misc/tilemaker/default.nix +++ b/pkgs/applications/misc/tilemaker/default.nix @@ -3,23 +3,15 @@ stdenv.mkDerivation (finalAttrs: { pname = "tilemaker"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "systemed"; repo = "tilemaker"; rev = "v${finalAttrs.version}"; - hash = "sha256-st6WDCk1RZ2lbfrudtcD+zenntyTMRHrIXw3nX5FHOU="; + hash = "sha256-O1zoRYNUeReIH2ZpL05SiwCZrZrM2IAkwhsP30k/hHc="; }; - patches = [ - # Fix build with Boost >= 1.79, remove on next upstream release - (fetchpatch { - url = "https://github.com/systemed/tilemaker/commit/252e7f2ad8938e38d51783d1596307dcd27ed269.patch"; - hash = "sha256-YSkhmpzEYk/mxVPSDYdwZclooB3zKRjDPzqamv6Nvyc="; - }) - ]; - postPatch = '' substituteInPlace src/tilemaker.cpp \ --replace "config.json" "$out/share/tilemaker/config-openmaptiles.json" \ @@ -48,6 +40,7 @@ stdenv.mkDerivation (finalAttrs: { meta = with lib; { description = "Make OpenStreetMap vector tiles without the stack"; homepage = "https://tilemaker.org/"; + changelog = "https://github.com/systemed/tilemaker/blob/v${version}/CHANGELOG.md"; license = licenses.free; # FTWPL maintainers = with maintainers; [ sikmir ]; platforms = platforms.unix; From 9796cbfe140d00504d7f8ee42a2b19132967608c Mon Sep 17 00:00:00 2001 From: Daniel Hancock Date: Fri, 3 Mar 2023 10:37:39 +0800 Subject: [PATCH 138/174] linux_xanmod_latest: 6.1.13 -> 6.1.14 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index c72bb2a628b6..05078bb8410e 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.1.13"; - hash = "sha256-H3bEKPzwqpeDWlsj3ciP5D8NXVBvi+oKisWXveHnjLQ="; + version = "6.1.14"; + hash = "sha256-4Gx+kz4YfwooCfb/1l1PZLMLk36WwC2WocBTGmAYD+M="; variant = "main"; }; From c70c23e08809f0266076427567d25a8f8bc28764 Mon Sep 17 00:00:00 2001 From: Daniel Hancock Date: Wed, 8 Mar 2023 16:00:39 +0800 Subject: [PATCH 139/174] linux_xanmod: 5.15.89 -> 6.1.15 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 05078bb8410e..638070db218c 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -3,8 +3,8 @@ let # These names are how they are designated in https://xanmod.org. ltsVariant = { - version = "5.15.89"; - hash = "sha256-wlb6er8L2EaqgJbmbATBdSxx1BGcJXNcsu+/4UBmYdQ="; + version = "6.1.15"; + hash = "sha256-KQ/1C8/nCQL8y/eTHQNJDYb/BSjwzdrUKdK05bSwuSI="; variant = "lts"; }; From 32af296bbed999d10a5e0f54c1a1ad062b4030dc Mon Sep 17 00:00:00 2001 From: Daniel Hancock Date: Wed, 8 Mar 2023 16:01:09 +0800 Subject: [PATCH 140/174] linux_xanmod_latest: 6.1.14 -> 6.2.2 --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 638070db218c..aaa7a5f30cb2 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -9,8 +9,8 @@ let }; mainVariant = { - version = "6.1.14"; - hash = "sha256-4Gx+kz4YfwooCfb/1l1PZLMLk36WwC2WocBTGmAYD+M="; + version = "6.2.2"; + hash = "sha256-YQSaIiGzszuOSO3rYnuBeucvhVlnue24b3ECRTH55bg="; variant = "main"; }; From ff894f5efa5636117d30cf837e29b83f4d8a12bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 09:48:12 +0000 Subject: [PATCH 141/174] typos: 1.13.16 -> 1.13.18 --- pkgs/development/tools/typos/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/typos/default.nix b/pkgs/development/tools/typos/default.nix index 2be0b533c6f1..7a0057ce1cde 100644 --- a/pkgs/development/tools/typos/default.nix +++ b/pkgs/development/tools/typos/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "typos"; - version = "1.13.16"; + version = "1.13.18"; src = fetchFromGitHub { owner = "crate-ci"; repo = pname; rev = "v${version}"; - hash = "sha256-3LJkWpksI9nep7QtEJdiEUZmwrWLyG/JKdu9YQh3KVk="; + hash = "sha256-J7K7fqtHNQYk6JlcHhcyojHQlIyaQVlAsDnfJUX1Ess="; }; - cargoHash = "sha256-Wqikf248nZE2iQ6zU4bvz10PL/Z/WJ1srImi+bZ8s5w="; + cargoHash = "sha256-a6ENeLG/t8Nb8oTNkcIWlquav4wJ0a3CqDEMQwTiuMM="; meta = with lib; { description = "Source code spell checker"; From ba4d56e20e434d0ac2f3006d60a549d994b28259 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 5 Mar 2023 18:49:04 +0200 Subject: [PATCH 142/174] tamarin-prover: install vim-plugin to nvim/site --- pkgs/applications/science/logic/tamarin-prover/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/science/logic/tamarin-prover/default.nix b/pkgs/applications/science/logic/tamarin-prover/default.nix index 02e60b398c38..143d11852448 100644 --- a/pkgs/applications/science/logic/tamarin-prover/default.nix +++ b/pkgs/applications/science/logic/tamarin-prover/default.nix @@ -80,6 +80,8 @@ mkDerivation (common "tamarin-prover" src // { # so that the package can be used as a vim plugin to install syntax coloration install -Dt $out/share/vim-plugins/tamarin-prover/syntax/ etc/syntax/spthy.vim install etc/filetype.vim -D $out/share/vim-plugins/tamarin-prover/ftdetect/tamarin.vim + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/tamarin-prover $out/share/nvim/site # Emacs SPTHY major mode install -Dt $out/share/emacs/site-lisp etc/spthy-mode.el ''; From 79c6578005f4eb8cd287a212ff72e0b262ffcf69 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 5 Mar 2023 18:49:18 +0200 Subject: [PATCH 143/174] fzf: install vim-plugin to nvim/site --- pkgs/tools/misc/fzf/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/fzf/default.nix b/pkgs/tools/misc/fzf/default.nix index 7b59dd92df46..5c31c5ac9d98 100644 --- a/pkgs/tools/misc/fzf/default.nix +++ b/pkgs/tools/misc/fzf/default.nix @@ -66,6 +66,8 @@ buildGoModule rec { installManPage man/man1/fzf.1 man/man1/fzf-tmux.1 install -D plugin/* -t $out/share/vim-plugins/${pname}/plugin + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/${pname} $out/share/nvim/site # Install shell integrations install -D shell/* -t $out/share/fzf/ From 78fee034672c1ffe3a570bc8958769a3a784d577 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 5 Mar 2023 18:49:28 +0200 Subject: [PATCH 144/174] txr: install vim-plugin to nvim/site --- pkgs/tools/text/txr/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/text/txr/default.nix b/pkgs/tools/text/txr/default.nix index fd375d6b44d0..a86435575d48 100644 --- a/pkgs/tools/text/txr/default.nix +++ b/pkgs/tools/text/txr/default.nix @@ -49,6 +49,8 @@ stdenv.mkDerivation (finalAttrs: { au BufRead,BufNewFile *.txr set filetype=txr | set lisp au BufRead,BufNewFile *.tl,*.tlo set filetype=tl | set lisp EOF + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/txr $out/share/nvim/site ''; meta = with lib; { From 4de2b19fa184d9c3d5aa158d0923931976441442 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sun, 5 Mar 2023 19:01:43 +0200 Subject: [PATCH 145/174] boogie: install vim-plugin to nvim/site --- pkgs/top-level/dotnet-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix index cd064113599a..bdf8faa66f0d 100644 --- a/pkgs/top-level/dotnet-packages.nix +++ b/pkgs/top-level/dotnet-packages.nix @@ -148,6 +148,8 @@ let self = dotnetPackages // overrides; dotnetPackages = with self; { install -Dt $vimdir/syntax/ Util/vim/syntax/boogie.vim mkdir $vimdir/ftdetect echo 'au BufRead,BufNewFile *.bpl set filetype=boogie' > $vimdir/ftdetect/bpl.vim + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/boogie $out/share/nvim/site ''; postFixup = '' From da95db0a3a06fda8bd13ff00c3a0a11a6409b3e3 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 8 Mar 2023 12:18:33 +0200 Subject: [PATCH 146/174] taskwarrior: fix nvim/site installation path --- pkgs/applications/misc/taskwarrior/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/taskwarrior/default.nix b/pkgs/applications/misc/taskwarrior/default.nix index ff778d4d0a4d..105d470d1358 100644 --- a/pkgs/applications/misc/taskwarrior/default.nix +++ b/pkgs/applications/misc/taskwarrior/default.nix @@ -34,9 +34,10 @@ stdenv.mkDerivation rec { rm -r $out/share/doc/task/scripts/bash rm -r $out/share/doc/task/scripts/fish # Install vim and neovim plugin - mkdir -p $out/share/vim-plugins $out/share/nvim/site + mkdir -p $out/share/vim-plugins mv $out/share/doc/task/scripts/vim $out/share/vim-plugins/task - ln -s $out/share/vim-plugins/task $out/share/nvim/site/task + mkdir -p $out/share/nvim + ln -s $out/share/vim-plugins/task $out/share/nvim/site ''; meta = with lib; { From 008aeed915240b6c0a140696b9b440641892bd79 Mon Sep 17 00:00:00 2001 From: ruby0b <106119328+ruby0b@users.noreply.github.com> Date: Wed, 8 Mar 2023 12:04:21 +0100 Subject: [PATCH 147/174] krabby: init at 0.1.6 --- maintainers/maintainer-list.nix | 5 +++++ pkgs/applications/misc/krabby/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/applications/misc/krabby/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index eb640d2474b1..659d7ad3b8f5 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -13000,6 +13000,11 @@ githubId = 61306; name = "Rene Treffer"; }; + ruby0b = { + github = "ruby0b"; + githubId = 106119328; + name = "ruby0b"; + }; rubyowo = { name = "Rei Star"; email = "perhaps-you-know@what-is.ml"; diff --git a/pkgs/applications/misc/krabby/default.nix b/pkgs/applications/misc/krabby/default.nix new file mode 100644 index 000000000000..9ddb9c0b0652 --- /dev/null +++ b/pkgs/applications/misc/krabby/default.nix @@ -0,0 +1,23 @@ +{ lib +, rustPlatform +, fetchCrate +}: +rustPlatform.buildRustPackage rec { + pname = "krabby"; + version = "0.1.6"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-BUX3D/UXJt9OxajUYaUDxI0u4t4ntSxqI1PMtk5IZNQ="; + }; + + cargoHash = "sha256-XynD19mlCmhHUCfbr+pmWkpb+D4+vt3bsgV+bpbUoaY="; + + meta = with lib; { + description = "Print pokemon sprites in your terminal"; + homepage = "https://github.com/yannjor/krabby"; + changelog = "https://github.com/yannjor/krabby/releases/tag/v${version}"; + license = licenses.gpl3; + maintainers = with maintainers; [ ruby0b ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7d4d7a4ff91b..ad16b595f694 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31030,6 +31030,8 @@ with pkgs; kpt = callPackage ../applications/networking/cluster/kpt { }; + krabby = callPackage ../applications/misc/krabby { }; + krane = callPackage ../applications/networking/cluster/krane { }; krita = libsForQt5.callPackage ../applications/graphics/krita { }; From b23a5794db78b057cf65cfcd4934a9c2a77aff8d Mon Sep 17 00:00:00 2001 From: Daniel Hancock Date: Wed, 8 Mar 2023 19:05:21 +0800 Subject: [PATCH 148/174] linux_xanmod: remove LRU option --- pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index aaa7a5f30cb2..fe7ecc6fa168 100644 --- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -33,11 +33,6 @@ let TCP_CONG_BBR2 = yes; DEFAULT_BBR2 = yes; - # Multigenerational LRU framework - # This can be removed when the LTS variant reaches version >= 6.1 (since it's on by default then) - LRU_GEN = yes; - LRU_GEN_ENABLED = yes; - # FQ-PIE Packet Scheduling NET_SCH_DEFAULT = yes; DEFAULT_FQ_PIE = yes; From fd400f5425f36c49b5592c45866094baeaf88a7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 11:14:29 +0000 Subject: [PATCH 149/174] terracognita: 0.8.1 -> 0.8.2 --- pkgs/development/tools/misc/terracognita/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/terracognita/default.nix b/pkgs/development/tools/misc/terracognita/default.nix index d101e017bfdf..6734b4fd858f 100644 --- a/pkgs/development/tools/misc/terracognita/default.nix +++ b/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.8.1"; + version = "0.8.2"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pI/TxC+RCQjtkYBA+BwW1jlDURKh1uf45GTIqz/rih8="; + sha256 = "sha256-OzqIUnvWVxaUAWRIKDWaxtmTeFGqvVYAgdbG4jrph7w="; }; - vendorSha256 = "sha256-ihoWhiK3TO1lAvk1oU8HVVDBDvLFBw+MMaK2avWfCB4="; + vendorHash = "sha256-LzkxVxqBJ3pRk3EI+/Lc6XSNyxhPUg61GKwI1Kmadsc="; doCheck = false; From 5b9ed59e80adbf700a76f070556cf3a56e8f1dba Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 8 Mar 2023 13:23:31 +0200 Subject: [PATCH 150/174] syncthingtray: 1.3.2 -> 1.3.3 Diff: https://github.com/Martchus/syncthingtray/compare/v1.3.2...v1.3.3 --- pkgs/applications/misc/syncthingtray/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 99404d38efee..0912fc1abcc5 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -28,14 +28,14 @@ https://github.com/NixOS/nixpkgs/issues/199596#issuecomment-1310136382 */ }: mkDerivation rec { - version = "1.3.2"; + version = "1.3.3"; pname = "syncthingtray"; src = fetchFromGitHub { owner = "Martchus"; repo = "syncthingtray"; rev = "v${version}"; - sha256 = "sha256-zLZw6ltdgO66dvKdLXhr/a6r8UhbSAx06jXrgMARHyw="; + sha256 = "sha256-6H5pV7/E4MP9UqVpm59DqfcK8Z8GwknO3+oWxAcnIsk="; }; buildInputs = [ From a5613d24efe0d082a23bbb7b828564d843490101 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 8 Mar 2023 13:23:45 +0200 Subject: [PATCH 151/174] libsForQt5.qtutilities: 6.10.0 -> 6.11.0 Diff: https://github.com/Martchus/qtutilities/compare/v6.10.0...v6.11.0 --- pkgs/development/libraries/qtutilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index c7365b422c97..984a28a2c85f 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.10.0"; + version = "6.11.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - hash = "sha256-xMuiizhOeS2UtD5OprLZb1MsjGyLd85SHcfW9Wja7tg="; + hash = "sha256-eMQyXxBupqcLmNtAcVBgTWtAtuyRlWB9GKNpomM10B0="; }; buildInputs = [ qtbase cpp-utilities ]; From c10d18c7e74aee0928322ca45087a27ce9183d5d Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 8 Mar 2023 13:24:10 +0200 Subject: [PATCH 152/174] cpp-utilities: 5.20.0 -> 5.21.0 Diff: https://github.com/Martchus/cpp-utilities/compare/v5.20.0...v5.21.0 --- pkgs/development/libraries/cpp-utilities/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 9cea13e6596e..4c9551332ee4 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "cpp-utilities"; - version = "5.20.0"; + version = "5.21.0"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KOvRNo8qd8nXhh/f3uAN7jOsNMTX8dJRGUHJXP+FdEs="; + sha256 = "sha256-jva/mVk20xqEcHlUMnOBy2I09oGoLkKaqwRSg0kIKS0="; }; nativeBuildInputs = [ cmake ]; From 270c722c89b37b383b144d3d3f4429fbe094fa86 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 8 Mar 2023 04:10:56 -0800 Subject: [PATCH 153/174] aws-vault: 6.6.2 -> 7.0.0 (#220033) --- pkgs/tools/admin/aws-vault/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/aws-vault/default.nix b/pkgs/tools/admin/aws-vault/default.nix index a1aa06b4a6a5..49c5e99a353b 100644 --- a/pkgs/tools/admin/aws-vault/default.nix +++ b/pkgs/tools/admin/aws-vault/default.nix @@ -7,16 +7,16 @@ }: buildGoModule rec { pname = "aws-vault"; - version = "6.6.2"; + version = "7.0.0"; src = fetchFromGitHub { owner = "99designs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BijZpk0vograOGlyuK7Wpsv8Y5DJvHUoTJVCex7VTTo="; + sha256 = "sha256-i7wL59MvjsLhEIs3Ejc/DB2m6IfrZqLCeSs1ziPCz+0="; }; - vendorHash = "sha256-zC4v9TlKHGCYRWX0ZWAVdCM7yw9eaAZ/4ZIZ38sM4S0="; + vendorHash = "sha256-kcaQw2ooJupMsK9rYlYZOIAW5H4Oa346K9VGjdnaq1E="; nativeBuildInputs = [ installShellFiles makeWrapper ]; From 668f36dbd53aa72348e0187b6d174312ea627b33 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 25 Feb 2023 12:32:00 -0600 Subject: [PATCH 154/174] ryujinx: 1.1.489 -> 1.1.650 --- .../emulators/ryujinx/appdir.patch | 23 ------- .../emulators/ryujinx/default.nix | 20 +++--- pkgs/applications/emulators/ryujinx/deps.nix | 67 +++++++------------ 3 files changed, 33 insertions(+), 77 deletions(-) delete mode 100644 pkgs/applications/emulators/ryujinx/appdir.patch diff --git a/pkgs/applications/emulators/ryujinx/appdir.patch b/pkgs/applications/emulators/ryujinx/appdir.patch deleted file mode 100644 index 696077d29dea..000000000000 --- a/pkgs/applications/emulators/ryujinx/appdir.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/Ryujinx.Common/ReleaseInformations.cs b/Ryujinx.Common/ReleaseInformations.cs -index 35890406..cca77163 100644 ---- a/Ryujinx.Common/ReleaseInformations.cs -+++ b/Ryujinx.Common/ReleaseInformations.cs -@@ -42,12 +42,14 @@ namespace Ryujinx.Common - - public static string GetBaseApplicationDirectory() - { -- if (IsFlatHubBuild()) -- { -+ //if (IsFlatHubBuild()) -+ //{ -+ // This needs to be a mutable path, while CurrentDomain.BaseDirectory refers to the nix store. -+ // AppDataManager.BaseDirPath refers to ".config/Ryujinx" on Linux. - return AppDataManager.BaseDirPath; -- } -+ //} - -- return AppDomain.CurrentDomain.BaseDirectory; -+ //return AppDomain.CurrentDomain.BaseDirectory; - } - } - } diff --git a/pkgs/applications/emulators/ryujinx/default.nix b/pkgs/applications/emulators/ryujinx/default.nix index 0ede7db9f10e..c5c21ed46fe1 100644 --- a/pkgs/applications/emulators/ryujinx/default.nix +++ b/pkgs/applications/emulators/ryujinx/default.nix @@ -29,13 +29,13 @@ buildDotnetModule rec { pname = "ryujinx"; - version = "1.1.489"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml + version = "1.1.650"; # Based off of the official github actions builds: https://github.com/Ryujinx/Ryujinx/actions/workflows/release.yml src = fetchFromGitHub { owner = "Ryujinx"; repo = "Ryujinx"; - rev = "37d27c4c99486312d9a282d7fc056c657efe0848"; - sha256 = "0h55vv2g9i81km0jzlb62arlky5ci4i45jyxig3znqr1zb4l0a67"; + rev = "b8556530f2b160db70ff571adf25ae26d4b8f58f"; + sha256 = "098yx4nwmkbab595a2xq9f5libzvsj01f3wf83nsbgzndy1h85ja"; }; dotnet-sdk = dotnetCorePackages.sdk_7_0; @@ -79,16 +79,12 @@ buildDotnetModule rec { SDL2 ]; - patches = [ - ./appdir.patch # Ryujinx attempts to write to the nix store. This patch redirects it to "~/.config/Ryujinx" on Linux. - ]; - projectFile = "Ryujinx.sln"; testProjectFile = "Ryujinx.Tests/Ryujinx.Tests.csproj"; doCheck = true; dotnetFlags = [ - "/p:ExtraDefineConstants=DISABLE_UPDATER" + "/p:ExtraDefineConstants=DISABLE_UPDATER%2CFORCE_EXTERNAL_BASE_DIR" ]; executables = [ @@ -113,11 +109,11 @@ buildDotnetModule rec { mkdir -p $out/share/{applications,icons/hicolor/scalable/apps,mime/packages} pushd ${src}/distribution/linux - install -D ./ryujinx.desktop $out/share/applications/ryujinx.desktop - install -D ./ryujinx-mime.xml $out/share/mime/packages/ryujinx-mime.xml - install -D ./ryujinx-logo.svg $out/share/icons/hicolor/scalable/apps/ryujinx.svg + install -D ./Ryujinx.desktop $out/share/applications/Ryujinx.desktop + install -D ./mime/Ryujinx.xml $out/share/mime/packages/Ryujinx.xml + install -D ../misc/Logo.svg $out/share/icons/hicolor/scalable/apps/Ryujinx.svg - substituteInPlace $out/share/applications/ryujinx.desktop \ + substituteInPlace $out/share/applications/Ryujinx.desktop \ --replace "Exec=Ryujinx" "Exec=$out/bin/Ryujinx" ln -s $out/bin/Ryujinx $out/bin/ryujinx diff --git a/pkgs/applications/emulators/ryujinx/deps.nix b/pkgs/applications/emulators/ryujinx/deps.nix index 214d0ee747c3..264b60dcf449 100644 --- a/pkgs/applications/emulators/ryujinx/deps.nix +++ b/pkgs/applications/emulators/ryujinx/deps.nix @@ -24,6 +24,7 @@ (fetchNuGet { pname = "ExCSS"; version = "4.1.4"; sha256 = "1y50xp6rihkydbf5l73mr3qq2rm6rdfjrzdw9h1dw9my230q5lpd"; }) (fetchNuGet { pname = "Fizzler"; version = "1.2.1"; sha256 = "1w5jb1d0figbv68dydbnlcsfmqlc3sv9z1zxp7d79dg2dkarc4qm"; }) (fetchNuGet { pname = "FluentAvaloniaUI"; version = "1.4.5"; sha256 = "1j5ivy83f13dgn09qrfkq44ijvh0m9rbdx8760g47di70c4lda7j"; }) + (fetchNuGet { pname = "FSharp.Core"; version = "7.0.200"; sha256 = "1ji816r8idwjmxk8bzyq1z32ybz7xdg3nb0a7pnvqr8vys11bkgb"; }) (fetchNuGet { pname = "GtkSharp.Dependencies"; version = "1.1.1"; sha256 = "0ffywnc3ca1lwhxdnk99l238vsprsrsh678bgm238lb7ja7m52pw"; }) (fetchNuGet { pname = "HarfBuzzSharp"; version = "2.8.2.1-preview.108"; sha256 = "0xs4px4fy5b6glc77rqswzpi5ddhxvbar1md6q9wla7hckabnq0z"; }) (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Linux"; version = "2.8.2.1-preview.108"; sha256 = "16wvgvyra2g1b38rxxgkk85wbz89hspixs54zfcm4racgmj1mrj4"; }) @@ -32,40 +33,38 @@ (fetchNuGet { pname = "HarfBuzzSharp.NativeAssets.Win32"; version = "2.8.2.1-preview.108"; sha256 = "0n6ymn9jqms3mk5hg0ar4y9jmh96myl6q0jimn7ahb1a8viq55k1"; }) (fetchNuGet { pname = "JetBrains.Annotations"; version = "10.3.0"; sha256 = "1grdx28ga9fp4hwwpwv354rizm8anfq4lp045q4ss41gvhggr3z8"; }) (fetchNuGet { pname = "jp2masa.Avalonia.Flexbox"; version = "0.2.0"; sha256 = "1abck2gad29mgf9gwqgc6wr8iwl64v50n0sbxcj1bcxgkgndraiq"; }) - (fetchNuGet { pname = "LibHac"; version = "0.17.0"; sha256 = "06ar4yv9mbvi42fpzs8g6j5yqrk1nbn5zssbh2k08sx3s757gd6f"; }) + (fetchNuGet { pname = "LibHac"; version = "0.18.0"; sha256 = "19d5fqdcws0730580jlda6pdddprxcrhw7b3ybiiglabsr7bmgdv"; }) (fetchNuGet { pname = "MicroCom.CodeGenerator.MSBuild"; version = "0.10.4"; sha256 = "1bdgy6g15d1mln1xpvs6sy0l2zvfs4hxw6nc3qm16qb8hdgvb73y"; }) (fetchNuGet { pname = "MicroCom.Runtime"; version = "0.10.4"; sha256 = "0ccbzp0d01dcahm7ban7xyh1rk7k2pkml3l5i7s85cqk5lnczpw2"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "2.9.6"; sha256 = "18mr1f0wpq0fir8vjnq0a8pz50zpnblr7sabff0yqx37c975934a"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.3"; sha256 = "09m4cpry8ivm9ga1abrxmvw16sslxhy2k5sl14zckhqb1j164im6"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Analyzers"; version = "3.3.4"; sha256 = "0wd6v57p53ahz5z9zg4iyzmy3src7rlsncyqpcag02jjj1yx6g58"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "3.4.0"; sha256 = "12rn6gl4viycwk3pz5hp5df63g66zvba4hnkwr3f0876jj5ivmsw"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.4.0"; sha256 = "0lag1m6xmr3sascf8ni80nqjz34fj364yzxrfs13k02fz1rlw5ji"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.Common"; version = "4.5.0"; sha256 = "0hjzca7v3qq4wqzi9chgxzycbaysnjgj28ps20695x61sia6i3da"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "3.4.0"; sha256 = "0rhylcwa95bxawcgixk64knv7p7xrykdjcabmx3gknk8hvj1ai9y"; }) - (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.4.0"; sha256 = "0wjsm651z8y6whxl915nlmk9py3xys5rs0caczmi24js38zx9rx7"; }) + (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp"; version = "4.5.0"; sha256 = "1l6v0ii5lapmfnfpjwi3j5bwlx8v9nvyani5pwvqzdfqsd5m7mp5"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.CSharp.Scripting"; version = "3.4.0"; sha256 = "1h2f0z9xnw987x8bydka1sd42ijqjx973md6v1gvpy1qc6ad244g"; }) (fetchNuGet { pname = "Microsoft.CodeAnalysis.Scripting.Common"; version = "3.4.0"; sha256 = "195gqnpwqkg2wlvk8x6yzm7byrxfq9bki20xmhf6lzfsdw3z4mf2"; }) - (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.4.1"; sha256 = "0bf68gq6mc6kzri4zi8ydc0xrazqwqg38bhbpjpj90zmqc28kari"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "17.5.0"; sha256 = "0briw00gb5bz9k9kx00p6ghq47w501db7gb6ig5zzmz9hb8lw4a4"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.3.0"; sha256 = "0gw297dgkh0al1zxvgvncqs0j15lsna9l1wpqas4rflmys440xvb"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.5.0"; sha256 = "01i28nvzccxbqmiz217fxs6hnjwmd5fafs37rd49a6qp53y6623l"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) - (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "3.1.6"; sha256 = "0b9myd7gqbpaw9pkd2bx45jhik9mwj0f1ss57sk2cxmag2lkdws5"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "6.0.0"; sha256 = "08c4fh1n8vsish1vh7h73mva34g0as4ph29s4lvps7kmjb4z64nl"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.25.1"; sha256 = "0kkwjci3w5hpmvm4ibnddw7xlqq97ab8pa9mfqm52ri5dq1l9ffp"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.25.1"; sha256 = "16nk02qj8xzqwpgsas50j1w0hhnnxdl7dhqrmgyg7s165qxi5h70"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.25.1"; sha256 = "1r0v67w94wyvyhikcvk92khnzbsqsvmmcdz3yd71wzv6fr4rvrrh"; }) - (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.25.1"; sha256 = "0srnsqzvr8yinl52ybpps0yg3dp0c8c96h7zariysp9cgb9pv8ds"; }) - (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.4.1"; sha256 = "02p1j9fncd4fb2hyp51kw49d0dz30vvazhzk24c9f5ccc00ijpra"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Abstractions"; version = "6.27.0"; sha256 = "053c1pkx9bnb9440f5rkzbdv99wgcaw95xnqjp09ncd2crh8kakp"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.JsonWebTokens"; version = "6.27.0"; sha256 = "103qvpahmn1x8yxj0kc920s27xbyjr15z8lf5ikrsrikalb5yjx9"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Logging"; version = "6.27.0"; sha256 = "1c3b0bkmxa24bvzi16jc7lc1nifqcq4jg7ild973bb8mivicagzv"; }) + (fetchNuGet { pname = "Microsoft.IdentityModel.Tokens"; version = "6.27.0"; sha256 = "0h51vdcz6pkv4ky2ygba4vks56rskripqb3fjz95ym0l0xg20s1a"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "17.5.0"; sha256 = "00gz2i8kx4mlq1ywj3imvf7wc6qzh0bsnynhw06z0mgyha1a21jy"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.2"; sha256 = "1507hnpr9my3z4w1r6xk5n0s1j3y6a2c2cnynj76za7cphxi1141"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.4.1"; sha256 = "0s68wf9yphm4hni9p6kwfk0mjld85f4hkrs93qbk5lzf6vv3kba1"; }) - (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.4.1"; sha256 = "1n9ilq8n5rhyxcri06njkxb0h2818dbmzddwd2rrvav91647m2s4"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "17.5.0"; sha256 = "0qkjyf3ky6xpjg5is2sdsawm99ka7fzgid2bvpglwmmawqgm8gls"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "17.5.0"; sha256 = "17g0k3r5n8grba8kg4nghjyhnq9w8v0w6c2nkyyygvfh8k8x9wh3"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) - (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "7.0.0"; sha256 = "1bh77misznh19m1swqm3dsbji499b8xh9gk6w74sgbkarf6ni8lb"; }) (fetchNuGet { pname = "MsgPack.Cli"; version = "1.0.1"; sha256 = "1dk2bs3g16lsxcjjm7gfx6jxa4667wccw94jlh2ql7y7smvh9z8r"; }) @@ -75,13 +74,13 @@ (fetchNuGet { pname = "Newtonsoft.Json"; version = "13.0.1"; sha256 = "0fijg0w6iwap8gvzyjnndds0q4b8anwxxvik7y8vgq97dram4srb"; }) (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.11.0"; sha256 = "0wv26gq39hfqw9md32amr5771s73f5zn1z9vs4y77cgynxr73s4z"; }) (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) - (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) - (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.5"; sha256 = "1dzjw5hi55ig5fjaj8a2hibp8smsg1lmy29s3zpnp79nj4i03r1s"; }) - (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.5"; sha256 = "0r5zhqbcnw0jsw2mqadrknh2wpc9asyz9kmpzh2d02ahk3x06faq"; }) - (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.5"; sha256 = "0fvyc3ibckjb5wvciks1ks86bmk16y8nmyr1sqn2sfawmdfq80d9"; }) - (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.5"; sha256 = "0p6xnlc852lm0m6cjwc8mdcxzhan5q6vna1lxk6n1bg78bd4slfv"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "4.1.0"; sha256 = "1z5g15npmsjszhfmkrdmp4ds7jpxzhxblss2rjl5mfn5sihy4cww"; }) + (fetchNuGet { pname = "OpenTK.Core"; version = "4.7.7"; sha256 = "1jyambm9lp0cnzy2mirv5psm0gvk2xi92k3r5jf0mi2jqmd2aphn"; }) + (fetchNuGet { pname = "OpenTK.Graphics"; version = "4.7.7"; sha256 = "1hrz76qlyw29cl5y917r65dnxwhcaswbq9ljzgc6fsnix4lngbvv"; }) + (fetchNuGet { pname = "OpenTK.Mathematics"; version = "4.7.7"; sha256 = "1xdagkfbs8nbs9lpqbr062pjmb5my1gj5yg2vbfw9xz238619lz2"; }) + (fetchNuGet { pname = "OpenTK.OpenAL"; version = "4.7.7"; sha256 = "1zqdk1iplqmchvm42k71z6y8fdz0lg2cd1xw9h0asf760qa9aq5z"; }) (fetchNuGet { pname = "OpenTK.redist.glfw"; version = "3.3.8.30"; sha256 = "1zm1ngzg6p64x0abz2x9mnl9x7acc1hmk4d1svk1mab95pqbrgwz"; }) - (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.5"; sha256 = "1958vp738bwg98alpsax5m97vzfgrkks4r11r22an4zpv0gnd2sd"; }) + (fetchNuGet { pname = "OpenTK.Windowing.GraphicsLibraryFramework"; version = "4.7.7"; sha256 = "1f33yqf5lr8qkza56xm1kqhs59v706yan2i3bkdlc56609gf8qy9"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) @@ -133,9 +132,9 @@ (fetchNuGet { pname = "Ryujinx.Graphics.Vulkan.Dependencies.MoltenVK"; version = "1.2.0"; sha256 = "1qkas5b6k022r57acpc4h981ddmzz9rwjbgbxbphrjd8h7lz1l5x"; }) (fetchNuGet { pname = "Ryujinx.GtkSharp"; version = "3.24.24.59-ryujinx"; sha256 = "0dri508x5kca2wk0mpgwg6fxj4n5n3kplapwdmlcpfcbwbmrrnyr"; }) (fetchNuGet { pname = "Ryujinx.PangoSharp"; version = "3.24.24.59-ryujinx"; sha256 = "1bdxm5k54zs0h6n2dh20j5jlyn0yml9r8qr828ql0k8zl7yhlq40"; }) - (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.24.2-build21"; sha256 = "11ya698m1qbas68jjfhah2qzf07xs4rxmbzncd954rqmmszws99l"; }) + (fetchNuGet { pname = "Ryujinx.SDL2-CS"; version = "2.26.1-build23"; sha256 = "1qnz15q2g6qknjgbv3pb53llqpb4lcwfwmgfvm6325zxjm79r792"; }) (fetchNuGet { pname = "shaderc.net"; version = "0.1.0"; sha256 = "0f35s9h0vj9f1rx9bssj66hibc3j9bzrb4wgb5q2jwkf5xncxbpq"; }) - (fetchNuGet { pname = "SharpZipLib"; version = "1.4.1"; sha256 = "1dh1jhgzc9bzd2hvyjp2nblavf0619djniyzalx7kvrbsxhrdjb6"; }) + (fetchNuGet { pname = "SharpZipLib"; version = "1.4.2"; sha256 = "0ijrzz2szxjmv2cipk7rpmg14dfaigdkg7xabjvb38ih56m9a27y"; }) (fetchNuGet { pname = "ShimSkiaSharp"; version = "0.5.18"; sha256 = "1i97f2zbsm8vhcbcfj6g4ml6g261gijdh7s3rmvwvxgfha6qyvkg"; }) (fetchNuGet { pname = "Silk.NET.Core"; version = "2.16.0"; sha256 = "1mkqc2aicvknmpyfry2v7jjxh3apaxa6dmk1vfbwxnkysl417x0k"; }) (fetchNuGet { pname = "Silk.NET.Vulkan"; version = "2.16.0"; sha256 = "0sg5mxv7ga5pq6wc0lz52j07fxrcfmb0an30r4cxsxk66298z2wy"; }) @@ -165,18 +164,11 @@ (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.0.12"; sha256 = "07y08kvrzpak873pmyxs129g1ch8l27zmg51pcyj2jvq03n0r0fc"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "1.5.0"; sha256 = "1d5gjn5afnrf461jlxzawcvihz195gayqpcfbv6dd7pxa9ialn06"; }) (fetchNuGet { pname = "System.Collections.Immutable"; version = "6.0.0"; sha256 = "1js98kmjn47ivcvkjqdmyipzknb9xbndssczm8gq224pbaj1p88c"; }) - (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) - (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) - (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) (fetchNuGet { pname = "System.ComponentModel.Annotations"; version = "4.5.0"; sha256 = "1jj6f6g87k0iwsgmg3xmnn67a14mq88np0l1ys5zkxhkvbc8976p"; }) - (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) - (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) - (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) (fetchNuGet { pname = "System.Console"; version = "4.0.0"; sha256 = "0ynxqbc3z1nwbrc11hkkpw9skw116z4y9wjzn7id49p9yi7mzmlf"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.0.0"; sha256 = "1n6c3fbz7v8d3pn77h4v5wvsfrfg7v1c57lg3nff3cjyh597v23m"; }) - (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.1.0"; sha256 = "1d2r76v1x610x61ahfpigda89gd13qydz6vbwzhpqlyvq8jj6394"; }) (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) @@ -186,14 +178,12 @@ (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.0.1"; sha256 = "0bv0alrm2ck2zk3rz25lfyk9h42f3ywq77mx1syl6vvyncnpg4qh"; }) (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.0.1"; sha256 = "0hjhdb5ri8z9l93bw04s7ynwrjrhx2n0p34sf33a9hl9phz69fyc"; }) - (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) - (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.25.1"; sha256 = "03ifsmlfs2v5ca6wc33q8xd89m2jm4h2q57s1s9f4yaigqbq1vrl"; }) + (fetchNuGet { pname = "System.IdentityModel.Tokens.Jwt"; version = "6.27.0"; sha256 = "0fihix48dk0jrkawby62fs163dv5hsh63vdhdyp7hfz6nabsqs2j"; }) (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) (fetchNuGet { pname = "System.IO.Compression"; version = "4.1.0"; sha256 = "0iym7s3jkl8n0vzm3jd6xqg9zjjjqni05x45dwxyjr2dy88hlgji"; }) (fetchNuGet { pname = "System.IO.Compression.ZipFile"; version = "4.0.1"; sha256 = "0h72znbagmgvswzr46mihn7xm7chfk2fhrp5krzkjf29pz0i6z82"; }) (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) - (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) @@ -228,7 +218,7 @@ (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) - (fetchNuGet { pname = "System.Reflection.Metadata"; version = "5.0.0"; sha256 = "17qsl5nanlqk9iz0l5wijdn6ka632fs1m1fvx18dfgswm258r3ss"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "6.0.1"; sha256 = "0fjqifk4qz9lw5gcadpfalpplyr0z2b3p9x7h0ll481a9sqvppc9"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) @@ -249,7 +239,6 @@ (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) - (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.0.1"; sha256 = "1y308zfvy0l5nrn46mqqr4wb4z1xk758pkk8svbz8b5ij7jnv4nn"; }) (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) (fetchNuGet { pname = "System.Security.Claims"; version = "4.3.0"; sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; }) @@ -270,30 +259,24 @@ (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "4.5.1"; sha256 = "1z21qyfs6sg76rp68qdx0c9iy57naan89pg7p6i3qpj8kyzn921w"; }) (fetchNuGet { pname = "System.Text.Encoding.CodePages"; version = "6.0.0"; sha256 = "0gm2kiz2ndm9xyzxgi0jhazgwslcs427waxgfa30m7yqll1kcrww"; }) (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) - (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "4.7.2"; sha256 = "0ap286ykazrl42if59bxhzv81safdfrrmfqr3112siwyajx4wih9"; }) (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "4.7.2"; sha256 = "10xj1pw2dgd42anikvj9qm23ccssrcp7dpznpj4j7xjp1ikhy3y4"; }) (fetchNuGet { pname = "System.Text.Json"; version = "6.0.0"; sha256 = "1si2my1g0q0qv1hiqnji4xh9wd05qavxnzj9dwgs23iqvgjky0gl"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) - (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) - (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.3"; sha256 = "0g7r6hm572ax8v28axrdxz1gnsblg6kszq17g51pj14a5rn2af7i"; }) (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.5.4"; sha256 = "0y6ncasgfcgnjrhynaf0lwpkpkmv4a07sswwkwbwb5h7riisj153"; }) - (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) (fetchNuGet { pname = "System.ValueTuple"; version = "4.5.0"; sha256 = "00k8ja51d0f9wrq4vv5z2jhq8hy31kac2rg0rv06prylcybzl8cy"; }) (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) - (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) - (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) - (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) - (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) (fetchNuGet { pname = "Tmds.DBus"; version = "0.9.0"; sha256 = "0vvx6sg8lxm23g5jvm5wh2gfs95mv85vd52lkq7d1b89bdczczf3"; }) + (fetchNuGet { pname = "UnicornEngine.Unicorn"; version = "2.0.2-rc1-f7c841d"; sha256 = "1fxvv77hgbblb14xwdpk231cgm5b3wl0li1ksx2vswxi9n758hrk"; }) (fetchNuGet { pname = "XamlNameReferenceGenerator"; version = "1.5.1"; sha256 = "11sld5a9z2rdglkykvylghka7y37ny18naywpgpxp485m9bc63wc"; }) ] From ff048a29f0565668fd7e9c746f8a57a4b173d9e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 8 Mar 2023 09:20:51 -0300 Subject: [PATCH 155/174] linuxKernel.kernels.linux_zen: 6.2.2-zen1 -> 6.2.2-zen2 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 9f172447f10e..82879df04d02 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -5,8 +5,8 @@ let # ./update-zen.py zen zenVariant = { version = "6.2.2"; #zen - suffix = "zen1"; #zen - sha256 = "004aghwdclky7w341yg9nkr5r58qnp4hxnmvxrp2z06pzcbsq933"; #zen + suffix = "zen2"; #zen + sha256 = "0hbsd8id1f27zlxffid7pyycm5dlh6hw8y6f8dv6czd8k9v1qngs"; #zen isLqx = false; }; # ./update-zen.py lqx From ff37d983b0e343dab0a69ae0602433cdafb13958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Wed, 8 Mar 2023 09:27:02 -0300 Subject: [PATCH 156/174] linuxKernel.kernels.linux_lqx: 6.1.14-lqx1 -> 6.1.15-lqx2 --- pkgs/os-specific/linux/kernel/zen-kernels.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 82879df04d02..597b76bb26c3 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -11,9 +11,9 @@ let }; # ./update-zen.py lqx lqxVariant = { - version = "6.1.14"; #lqx - suffix = "lqx1"; #lqx - sha256 = "026nnmbpipk4gg7llsvm4fgws3ka0hjdywl7h0a8bvq6n9by15i6"; #lqx + version = "6.1.15"; #lqx + suffix = "lqx2"; #lqx + sha256 = "1z3bwn2pmbaa8cqld4fsxkzkdb5213n83bgb8jkm9v4943pa220i"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { From 29da123428dd71f553f8effe28d284d8d57b080b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 8 Mar 2023 13:54:34 +0100 Subject: [PATCH 157/174] offpunk: 1.8->1.9 --- pkgs/applications/networking/browsers/offpunk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index bedf059f2714..22738d889425 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -31,13 +31,13 @@ let in stdenv.mkDerivation (finalAttrs: { pname = "offpunk"; - version = "1.8"; + version = "1.9"; src = fetchFromSourcehut { owner = "~lioploum"; repo = "offpunk"; rev = "v${finalAttrs.version}"; - sha256 = "0xv7b3qkwyq55sz7c0v0pknrpikhzyqgr5y4y30cwa7jd8sn423f"; + sha256 = "sha256-sxX4/7jbNbLwHVfE1lDtjr/luby5zAf6Hy1RcwXZLBA="; }; nativeBuildInputs = [ makeWrapper ]; From be5216077e2ed22cde9af456f90cf0cfdf0358fe Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Wed, 8 Mar 2023 13:55:16 +0100 Subject: [PATCH 158/174] offpunk: install the project's man page Release v1.9 introduces a man page --- pkgs/applications/networking/browsers/offpunk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/browsers/offpunk/default.nix b/pkgs/applications/networking/browsers/offpunk/default.nix index 22738d889425..6945ce5245a2 100644 --- a/pkgs/applications/networking/browsers/offpunk/default.nix +++ b/pkgs/applications/networking/browsers/offpunk/default.nix @@ -1,5 +1,6 @@ { fetchFromSourcehut, + installShellFiles, less, lib, makeWrapper, @@ -40,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: { sha256 = "sha256-sxX4/7jbNbLwHVfE1lDtjr/luby5zAf6Hy1RcwXZLBA="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; buildInputs = otherDependencies ++ pythonDependencies; installPhase = '' @@ -52,6 +53,7 @@ stdenv.mkDerivation (finalAttrs: { --set PYTHONPATH "$PYTHONPATH" \ --set PATH ${lib.makeBinPath otherDependencies} + installManPage man/*.1 runHook postInstall ''; From 978b7cfd6046a8611aeb429ca27cfc886eb91a17 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Tue, 7 Mar 2023 19:49:35 +0100 Subject: [PATCH 159/174] go-licenses: init at 1.6.0 --- .../tools/misc/go-licenses/default.nix | 48 ++++++++++++++ .../go-licenses/fix-go-version-error.patch | 65 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 115 insertions(+) create mode 100644 pkgs/development/tools/misc/go-licenses/default.nix create mode 100644 pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch diff --git a/pkgs/development/tools/misc/go-licenses/default.nix b/pkgs/development/tools/misc/go-licenses/default.nix new file mode 100644 index 000000000000..c9bc25973a4e --- /dev/null +++ b/pkgs/development/tools/misc/go-licenses/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "go-licenses"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "google"; + repo = "go-licenses"; + rev = "refs/tags/v${version}"; + hash = "sha256-GAlwTVoVA+n9+EfhybmpKm16FoY9kFzrxy1ZQxS6A8E="; + }; + + vendorHash = "sha256-ToRn2wj7Yi+UDJwvAhV0ACEhqlcQjt4bRpz7abNRt9A="; + + patches = [ + # Without this, we get error messages like: + # vendor/golang.org/x/sys/unix/syscall.go:83:16: unsafe.Slice requires go1.17 or later (-lang was set to go1.16; check go.mod) + # The patch was generated by changing "go 1.16" to "go 1.17" and executing `go mod tidy`. + ./fix-go-version-error.patch + ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + installShellCompletion --cmd go-licenses \ + --bash <("$out/bin/go-licenses" completion bash) \ + --fish <("$out/bin/go-licenses" completion fish) \ + --zsh <("$out/bin/go-licenses" completion zsh) + ''; + + # Tests require internet connection + doCheck = false; + + meta = with lib; { + changelog = "https://github.com/google/go-licenses/releases/tag/v${version}"; + description = "Reports on the licenses used by a Go package and its dependencies"; + homepage = "https://github.com/google/go-licenses"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ Luflosi ]; + }; +} diff --git a/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch b/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch new file mode 100644 index 000000000000..1e102636dd45 --- /dev/null +++ b/pkgs/development/tools/misc/go-licenses/fix-go-version-error.patch @@ -0,0 +1,65 @@ +diff --git a/go.mod b/go.mod +index 7e3d596..d90b393 100644 +--- a/go.mod ++++ b/go.mod +@@ -1,27 +1,50 @@ + module github.com/google/go-licenses + +-go 1.16 ++go 1.17 + + require ( +- cloud.google.com/go/iam v0.4.0 // indirect +- github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect + github.com/google/go-cmp v0.5.8 + github.com/google/go-replayers/httpreplay v1.1.1 + github.com/google/licenseclassifier v0.0.0-20210722185704-3043a050f148 +- github.com/kr/text v0.2.0 // indirect +- github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect + github.com/otiai10/copy v1.6.0 +- github.com/pkg/errors v0.9.1 // indirect +- github.com/sergi/go-diff v1.2.0 // indirect + github.com/spf13/cobra v1.6.0 +- github.com/stretchr/testify v1.8.0 // indirect + go.opencensus.io v0.23.0 +- golang.org/x/crypto v0.1.0 // indirect + golang.org/x/mod v0.7.0 + golang.org/x/net v0.5.0 + golang.org/x/text v0.6.0 + golang.org/x/tools v0.5.0 +- gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect + gopkg.in/src-d/go-git.v4 v4.13.1 + k8s.io/klog/v2 v2.80.1 + ) ++ ++require ( ++ cloud.google.com/go v0.102.1 // indirect ++ cloud.google.com/go/iam v0.4.0 // indirect ++ cloud.google.com/go/storage v1.22.1 // indirect ++ github.com/emirpasic/gods v1.12.0 // indirect ++ github.com/go-logr/logr v1.2.0 // indirect ++ github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect ++ github.com/google/martian/v3 v3.3.2 // indirect ++ github.com/inconshreveable/mousetrap v1.0.1 // indirect ++ github.com/jbenet/go-context v0.0.0-20150711004518-d14ea06fba99 // indirect ++ github.com/kevinburke/ssh_config v0.0.0-20190725054713-01f96b0aa0cd // indirect ++ github.com/kr/text v0.2.0 // indirect ++ github.com/mitchellh/go-homedir v1.1.0 // indirect ++ github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect ++ github.com/pkg/errors v0.9.1 // indirect ++ github.com/sergi/go-diff v1.2.0 // indirect ++ github.com/spf13/pflag v1.0.5 // indirect ++ github.com/src-d/gcfg v1.4.0 // indirect ++ github.com/stretchr/testify v1.8.0 // indirect ++ github.com/xanzy/ssh-agent v0.2.1 // indirect ++ golang.org/x/crypto v0.1.0 // indirect ++ golang.org/x/oauth2 v0.0.0-20220622183110-fd043fe589d2 // indirect ++ golang.org/x/sys v0.4.0 // indirect ++ google.golang.org/api v0.93.0 // indirect ++ google.golang.org/genproto v0.0.0-20220815135757-37a418bb8959 // indirect ++ google.golang.org/grpc v1.48.0 // indirect ++ google.golang.org/protobuf v1.28.1 // indirect ++ gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect ++ gopkg.in/src-d/go-billy.v4 v4.3.2 // indirect ++ gopkg.in/warnings.v0 v0.1.2 // indirect ++) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 930a9c58276d..d91664c4fe1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18060,6 +18060,8 @@ with pkgs; gnumake = callPackage ../development/tools/build-managers/gnumake { }; gnumake42 = callPackage ../development/tools/build-managers/gnumake/4.2 { }; + go-licenses = callPackage ../development/tools/misc/go-licenses { }; + gob2 = callPackage ../development/tools/misc/gob2 { }; gocd-agent = callPackage ../development/tools/continuous-integration/gocd-agent { }; From 76657296600b57277016389a8daa96342e77df06 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Wed, 8 Mar 2023 19:28:06 +0530 Subject: [PATCH 160/174] flyctl: 0.0.477 -> 0.0.478 --- pkgs/development/web/flyctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index d0804ba71b45..3352bfcc748c 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.477"; + version = "0.0.478"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - hash = "sha256-mGCMtyjR6fcflYsas9nXjS+MRPH2EXTgNh764pn3b1U="; + hash = "sha256-tMDcEpRpmFYOiEz+bmR5O+fushGPeBU28HoDqNuOP+Y="; }; - vendorHash = "sha256-RFcdntxSW4YKrACAJqIb2DLHuLC6EODBCk0YTK+y4J8="; + vendorHash = "sha256-W5z6Rbr8dPP0kAhVG8UPy5rK9wz5mZVK9geYt9umftE="; subPackages = [ "." ]; From ff28bb10554a2e967cde4b5183e0fe02b8c5f8a7 Mon Sep 17 00:00:00 2001 From: K900 Date: Wed, 8 Mar 2023 17:52:10 +0300 Subject: [PATCH 161/174] asusctl: 4.5.6 -> 4.5.8 --- pkgs/applications/system/asusctl/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/system/asusctl/default.nix b/pkgs/applications/system/asusctl/default.nix index 2e1e999e9937..f9976fa1fd27 100644 --- a/pkgs/applications/system/asusctl/default.nix +++ b/pkgs/applications/system/asusctl/default.nix @@ -13,16 +13,16 @@ rustPlatform.buildRustPackage rec { pname = "asusctl"; - version = "4.5.6"; + version = "4.5.8"; src = fetchFromGitLab { owner = "asus-linux"; repo = "asusctl"; rev = version; - hash = "sha256-9WEP+/BI5fh3IhVsLSPrnkiZ3DmXwTFaPXyzBNs7cNM="; + hash = "sha256-6AitRpyLIq5by9/rXdIC8AChMVKZmR1Eo5GTo+DtGhc="; }; - cargoSha256 = "sha256-iXMor2hI8Q/tpdSCaUjiEsvVfmWKXI6Az0J6aqMwE2E="; + cargoHash = "sha256-lSjcsHnw6VZxvxxHUAkVEIZiI58xduInCJDXsFPGzMM="; postPatch = '' files=" @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { --replace /usr/bin/sleep ${coreutils}/bin/sleep ''; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ pkg-config cmake rustPlatform.bindgenHook ]; buildInputs = [ systemd fontconfig gtk3 ]; From d8d8b55e7dccfe10e99d2f4ed968fa8acaef9b78 Mon Sep 17 00:00:00 2001 From: K900 Date: Mon, 27 Feb 2023 02:51:24 +0300 Subject: [PATCH 162/174] nixos/murmur: expose dbus --- nixos/modules/services/networking/murmur.nix | 30 ++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/nixos/modules/services/networking/murmur.nix b/nixos/modules/services/networking/murmur.nix index 32498ca25ea8..9ec4f57ca43e 100644 --- a/nixos/modules/services/networking/murmur.nix +++ b/nixos/modules/services/networking/murmur.nix @@ -42,6 +42,8 @@ let ${if cfg.sslKey == "" then "" else "sslKey="+cfg.sslKey} ${if cfg.sslCa == "" then "" else "sslCA="+cfg.sslCa} + ${lib.optionalString (cfg.dbus != null) "dbus=${cfg.dbus}"} + ${cfg.extraConfig} ''; in @@ -282,6 +284,12 @@ in `murmur` is running. ''; }; + + dbus = mkOption { + type = types.enum [ null "session" "system" ]; + default = null; + description = lib.mdDoc "Enable D-Bus remote control. Set to the bus you want Murmur to connect to."; + }; }; }; @@ -325,5 +333,27 @@ in Group = "murmur"; }; }; + + # currently not included in upstream package, addition requested at + # https://github.com/mumble-voip/mumble/issues/6078 + services.dbus.packages = mkIf (cfg.dbus == "system") [(pkgs.writeTextFile { + name = "murmur-dbus-policy"; + text = '' + + + + + + + + + + + + ''; + destination = "/share/dbus-1/system.d/murmur.conf"; + })]; }; } From 4d40a028a1f3795e0b8257cab781c8827123abf5 Mon Sep 17 00:00:00 2001 From: arcnmx Date: Wed, 8 Mar 2023 07:56:52 -0800 Subject: [PATCH 163/174] rtorrent: set meta.mainProgram --- pkgs/applications/networking/p2p/jesec-rtorrent/default.nix | 1 + pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix index 91a078590bf2..5a0cebc52819 100644 --- a/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/jesec-rtorrent/default.nix @@ -65,5 +65,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ winter AndersonTorres ]; platforms = platforms.linux; + mainProgram = "rtorrent"; }; } diff --git a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix index fa459137f199..a6f59374db88 100644 --- a/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix +++ b/pkgs/applications/networking/p2p/rakshasa-rtorrent/default.nix @@ -68,5 +68,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ebzzry codyopel ]; platforms = platforms.unix; + mainProgram = "rtorrent"; }; } From afeb316dc36c7f104ea43045d77745ab0705c873 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 16:32:12 +0000 Subject: [PATCH 164/174] wakapi: 2.6.1 -> 2.6.2 --- pkgs/tools/misc/wakapi/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/wakapi/default.nix b/pkgs/tools/misc/wakapi/default.nix index c04c98e05315..1300b2df9081 100644 --- a/pkgs/tools/misc/wakapi/default.nix +++ b/pkgs/tools/misc/wakapi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "wakapi"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "muety"; repo = pname; rev = version; - sha256 = "1bhd96la2ipwna9lic50pd5klcc3xj9yqd5rd1cgzznbm4ylpjqb"; + sha256 = "sha256-yMxcePwBUteqrdfvDjZSRInOXMFmwaFoVBihcMQFTME="; }; - vendorHash = "sha256-fkSXaP9hHCCyO8mFB5CKPExifuNjTvDnXupjCVllG9I"; + vendorHash = "sha256-sfx8qlmJrS0hkD6DSvKqfnBDbxj8eNA3hnprSwA2fSI="; # Not a go module required by the project, contains development utilities excludedPackages = [ "scripts" ]; From 53d3317f6d43e3759f4eef365c6a8dfe099570ff Mon Sep 17 00:00:00 2001 From: Victor Freire Date: Wed, 8 Mar 2023 14:12:32 -0300 Subject: [PATCH 165/174] vscode-extensions.ionide.ionide-fsharp: 6.0.5 -> 7.5.1 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f961001e4ffa..9d941f78c2ef 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1442,8 +1442,8 @@ let mktplcRef = { name = "Ionide-fsharp"; publisher = "Ionide"; - version = "6.0.5"; - sha256 = "sha256-vlmLr/1rBreqZifzEwAlhyGzHG28oZa+kmMzRl53tOI="; + version = "7.5.1"; + sha256 = "sha256-AiDYqYF+F69O/aeolIEzqLmg20YN/I4EV6XMa8UgMns="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/Ionide.Ionide-fsharp/changelog"; From ad075bd91580666d97ad5125d78c7c5cd32403c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Tue, 7 Mar 2023 21:56:48 +0100 Subject: [PATCH 166/174] viceroy: init at 0.3.5 --- pkgs/development/tools/viceroy/default.nix | 29 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/tools/viceroy/default.nix diff --git a/pkgs/development/tools/viceroy/default.nix b/pkgs/development/tools/viceroy/default.nix new file mode 100644 index 000000000000..11dfd22d51d3 --- /dev/null +++ b/pkgs/development/tools/viceroy/default.nix @@ -0,0 +1,29 @@ +{ rustPlatform, fetchFromGitHub, lib, stdenv, Security }: + +rustPlatform.buildRustPackage rec { + pname = "viceroy"; + version = "0.3.5"; + + src = fetchFromGitHub { + owner = "fastly"; + repo = pname; + rev = "v${version}"; + hash = "sha256-X+RmsS+GxdBiFt2Fo0MgkuyjQDwQNuOLDL1YVQdqhXo="; + }; + + buildInputs = lib.optional stdenv.isDarwin Security; + + cargoHash = "sha256-vbhBlfHrFcjtaUJHYvB106ElYP0NquOo+rgIx9cWenY="; + + cargoTestFlags = [ + "--package viceroy-lib" + ]; + + meta = with lib; { + description = "Viceroy provides local testing for developers working with Compute@Edge"; + homepage = "https://github.com/fastly/Viceroy"; + license = licenses.asl20; + maintainers = with maintainers; [ ereslibre shyim ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa4c2a074850..28c3ea53f54b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13598,6 +13598,10 @@ with pkgs; veryfasttree = callPackage ../applications/science/biology/veryfasttree { }; + viceroy = callPackage ../development/tools/viceroy { + inherit (darwin.apple_sdk.frameworks) Security; + }; + vlan = callPackage ../tools/networking/vlan { }; vmtouch = callPackage ../tools/misc/vmtouch { }; From 70fa4c65696495be22bce506accfca52310f476b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 18:26:56 +0000 Subject: [PATCH 167/174] haste-server: ccc5049b07e9f90ec19fc2a88e5056367c53e202 -> b52b394bad909ddf151073987671e843540d91d6 --- pkgs/servers/haste-server/default.nix | 4 +-- pkgs/servers/haste-server/node-deps.nix | 42 ++++++++++++------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pkgs/servers/haste-server/default.nix b/pkgs/servers/haste-server/default.nix index cc445312e691..14ec58afa350 100644 --- a/pkgs/servers/haste-server/default.nix +++ b/pkgs/servers/haste-server/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "haste-server"; - version = "ccc5049b07e9f90ec19fc2a88e5056367c53e202"; + version = "b52b394bad909ddf151073987671e843540d91d6"; src = fetchFromGitHub { owner = "toptal"; repo = "haste-server"; rev = version; - hash = "sha256-ODFHB2QwfLPxfjFsHrblSeiqLc9nPo7EOPGQ3AoqzSQ="; + hash = "sha256-AVoz5MY5gNxQrHtDMPbQ85IjmHii1v6C2OXpEQj9zC8="; }; nativeBuildInputs = [ diff --git a/pkgs/servers/haste-server/node-deps.nix b/pkgs/servers/haste-server/node-deps.nix index 36a5d6fd3976..2c8e11bb9247 100644 --- a/pkgs/servers/haste-server/node-deps.nix +++ b/pkgs/servers/haste-server/node-deps.nix @@ -850,13 +850,13 @@ let sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; - "pg-8.8.0" = { + "pg-8.10.0" = { name = "pg"; packageName = "pg"; - version = "8.8.0"; + version = "8.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.8.0.tgz"; - sha512 = "UXYN0ziKj+AeNNP7VDMwrehpACThH7LUl/p8TDFpEUuSejCUIwGSfxpHsPvtM6/WXFy6SU4E5RG4IJV/TZAGjw=="; + url = "https://registry.npmjs.org/pg/-/pg-8.10.0.tgz"; + sha512 = "ke7o7qSTMb47iwzOSaZMfeR7xToFdkE71ifIipOAAaLIM0DYzfOAXlgFFmYUIE2BcJtvnVlGCID84ZzCegE8CQ=="; }; }; "pg-connection-string-2.5.0" = { @@ -877,22 +877,22 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-pool-3.5.2" = { + "pg-pool-3.6.0" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.5.2"; + version = "3.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.5.2.tgz"; - sha512 = "His3Fh17Z4eg7oANLob6ZvH8xIVen3phEZh2QuyrIl4dQSDVEabNducv6ysROKpDNPSD+12tONZVWfSgMvDD9w=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.6.0.tgz"; + sha512 = "clFRf2ksqd+F497kWFyM21tMjeikn60oGDmqMT8UBrynEwVEX/5R5xd2sdvdo1cZCFlguORNpVuqxIj+aK4cfQ=="; }; }; - "pg-protocol-1.5.0" = { + "pg-protocol-1.6.0" = { name = "pg-protocol"; packageName = "pg-protocol"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.5.0.tgz"; - sha512 = "muRttij7H8TqRNu/DxrAJQITO4Ac7RmX3Klyr/9mJEOBeIpgnF8f9jAfRz5d3XwQZl5qBjF9gLsUtMPJE0vezQ=="; + url = "https://registry.npmjs.org/pg-protocol/-/pg-protocol-1.6.0.tgz"; + sha512 = "M+PDm637OY5WM307051+bsDia5Xej6d9IR4GwJse1qA1DIhiKlksvrneZOYQq42OM+spubpcNYEo2FcKQrDk+Q=="; }; }; "pg-types-2.2.0" = { @@ -985,13 +985,13 @@ let sha512 = "+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ=="; }; }; - "readable-stream-3.6.0" = { + "readable-stream-3.6.1" = { name = "readable-stream"; packageName = "readable-stream"; - version = "3.6.0"; + version = "3.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; - sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.1.tgz"; + sha512 = "+rQmrWMYGA90yenhTYsLWAsLsqVC8osOw6PKE1HDYiO0gdPeKe/xDHNzIAIn4C91YQ6oenEhfYqqc1883qHbjQ=="; }; }; "readdirp-3.5.0" = { @@ -1350,7 +1350,7 @@ let name = "haste"; packageName = "haste"; version = "0.1.0"; - src = ../../../../../../../../../nix/store/zmi5rwpy1kmyj52ymv3yc8ziiypjgrxd-source; + src = ../../../../../../../../../nix/store/v45nw2igqcjw58j7ns9xrqj6f6n3jafd-source; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" sources."ansi-colors-4.1.1" @@ -1365,7 +1365,7 @@ let sources."binary-extensions-2.2.0" (sources."bl-4.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."readable-stream-3.6.1" sources."string_decoder-1.3.0" ]; }) @@ -1466,11 +1466,11 @@ let sources."parseurl-1.3.3" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" - sources."pg-8.8.0" + sources."pg-8.10.0" sources."pg-connection-string-2.5.0" sources."pg-int8-1.0.1" - sources."pg-pool-3.5.2" - sources."pg-protocol-1.5.0" + sources."pg-pool-3.6.0" + sources."pg-protocol-1.6.0" sources."pg-types-2.2.0" sources."pgpass-1.0.5" sources."picomatch-2.3.1" From 856936abc863e1f9b95368c4ac300b0ac82c4e03 Mon Sep 17 00:00:00 2001 From: cidkidnix Date: Wed, 8 Mar 2023 11:48:13 -0600 Subject: [PATCH 168/174] buildRustCrate: add libiconv to nativeBuildInputs on darwin Fixes linker errors while building build.rs where it tries to link libiconv but cannot find it. Rust executable build for Darwin need libiconv, and indeed buildInputs already has this case handled. So why is another change needed? Suppose we are cross compiling from Darwin (the build platform) to something else, and the package has a build.rs build script. The build script is built for the build platform (Darwin) and is also a regular Rust executable, needing libiconv, but due to cross compilation (and strict deps) we need an extra nativeBuildInput. --- pkgs/build-support/rust/build-rust-crate/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/build-rust-crate/default.nix b/pkgs/build-support/rust/build-rust-crate/default.nix index 435a942daa26..c4d1ef7b209e 100644 --- a/pkgs/build-support/rust/build-rust-crate/default.nix +++ b/pkgs/build-support/rust/build-rust-crate/default.nix @@ -276,7 +276,9 @@ crate_: lib.makeOverridable name = "rust_${crate.crateName}-${crate.version}${lib.optionalString buildTests_ "-test"}"; version = crate.version; depsBuildBuild = [ pkgsBuildBuild.stdenv.cc ]; - nativeBuildInputs = [ rust stdenv.cc cargo jq ] ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; + nativeBuildInputs = [ rust stdenv.cc cargo jq ] + ++ lib.optionals stdenv.buildPlatform.isDarwin [ libiconv ] + ++ (crate.nativeBuildInputs or [ ]) ++ nativeBuildInputs_; buildInputs = lib.optionals stdenv.isDarwin [ libiconv ] ++ (crate.buildInputs or [ ]) ++ buildInputs_; dependencies = map lib.getLib dependencies_; buildDependencies = map lib.getLib buildDependencies_; From 64a0faa70032bf4401e80dba27a9c76d681c8934 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 17:36:44 +0000 Subject: [PATCH 169/174] erigon: 2.39.0 -> 2.40.1 --- pkgs/applications/blockchains/erigon/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon/default.nix b/pkgs/applications/blockchains/erigon/default.nix index e4823f1a66c3..fd864e65eb1d 100644 --- a/pkgs/applications/blockchains/erigon/default.nix +++ b/pkgs/applications/blockchains/erigon/default.nix @@ -2,7 +2,7 @@ let pname = "erigon"; - version = "2.39.0"; + version = "2.40.1"; in buildGoModule { inherit pname version; @@ -11,11 +11,11 @@ buildGoModule { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HlAnuc6n/de6EzHTit3xGCFLrc2+S+H/o0gCxH8d0aU="; + sha256 = "sha256-iuJ/iajZiqKBP4hgrwt8KKkWEdYa+idpai/aWpCOjQw="; fetchSubmodules = true; }; - vendorSha256 = "sha256-kKwaA6NjRdg97tTEzEI+TWMSx7izzFWcefR5B086cUY="; + vendorSha256 = "sha256-0xHu7uvk7kRxyLXGvrT9U8vgfZPrs7Rmg2lFH49YOSI="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From 36e5e6be647356dcd6b9aa0dd31187135af40d17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Mar 2023 19:09:10 +0000 Subject: [PATCH 170/174] redpanda: 22.3.13 -> 23.1.1 --- pkgs/servers/redpanda/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/redpanda/default.nix b/pkgs/servers/redpanda/default.nix index c59aa621cc4d..fde3454dd310 100644 --- a/pkgs/servers/redpanda/default.nix +++ b/pkgs/servers/redpanda/default.nix @@ -7,12 +7,12 @@ , stdenv }: let - version = "22.3.13"; + version = "23.1.1"; src = fetchFromGitHub { owner = "redpanda-data"; repo = "redpanda"; rev = "v${version}"; - sha256 = "sha256-cUQFDXWnQYSLcfKFYg6BLrxF77iX+Yx3hcul4tMxdoc="; + sha256 = "sha256-3IRhr+XQLZXCeKhUHOlE8REwUkxLw1jcHYIataG3BaM="; }; server = callPackage ./server.nix { inherit src version; }; in @@ -21,7 +21,7 @@ buildGoModule rec { inherit doCheck src version; modRoot = "./src/go/rpk"; runVend = false; - vendorSha256 = "sha256-JVZuHRh3gavIGArxDkqUQsL5oBjz35EKGsC75Sy+cMo="; + vendorHash = "sha256-hG1UPy6Lp0F6y0h9Py28zRPS/s5JvoJ2P3OSOrrjz8U="; ldflags = [ ''-X "github.com/redpanda-data/redpanda/src/go/rpk/pkg/cli/cmd/version.version=${version}"'' From 8fbdc12942691a7aa5b5b195b1c0c1924ca49c36 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 8 Mar 2023 13:52:45 -0500 Subject: [PATCH 171/174] terraform: 1.3.9 -> 1.4.0 --- pkgs/applications/networking/cluster/terraform/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6a722b80b834..bc7a2545bdd7 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -168,9 +168,9 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.3.9"; - hash = "sha256-gwuUdO9m4Q2tFRLSVTbcsclOq9jcbQU4JV9nIElTkQ4="; - vendorHash = "sha256-CE6jNBvM0980+R0e5brK5lMrkad+91qTt9mp2h3NZyY="; + version = "1.4.0"; + hash = "sha256-jt+axusOYbJmGJpim8i76Yfb/QgWduUmZMIiIs0CJoA="; + vendorHash = "sha256-M22VONnPs0vv2L3q/2RjE0+Jna/Kv95xubVNthp5bMc="; patches = [ ./provider-path-0_15.patch ]; passthru = { inherit plugins; From 6d9f07d8fe1b965e9dffdda2ac9638347e8b9bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Feb 2023 20:05:07 -0800 Subject: [PATCH 172/174] librclone: init at 1.61.1 --- .../libraries/librclone/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/libraries/librclone/default.nix diff --git a/pkgs/development/libraries/librclone/default.nix b/pkgs/development/libraries/librclone/default.nix new file mode 100644 index 000000000000..dbf46ab398bd --- /dev/null +++ b/pkgs/development/libraries/librclone/default.nix @@ -0,0 +1,33 @@ +{ lib +, stdenv +, buildGoModule +, rclone +}: + +let + ext = stdenv.hostPlatform.extensions.sharedLibrary; +in buildGoModule rec { + pname = "librclone"; + inherit (rclone) version src vendorSha256; + + buildPhase = '' + runHook preBuild + cd librclone + go build --buildmode=c-shared -o librclone${ext} github.com/rclone/rclone/librclone + runHook postBuildd + ''; + + installPhase = '' + runHook preInstall + install -Dt $out/lib librclone${ext} + install -Dt $out/include librclone.h + runHook postInstall + ''; + + meta = { + description = "Rclone as a C library"; + homepage = "https://github.com/rclone/rclone/tree/master/librclone"; + maintainers = with lib.maintainers; [ dotlambda ]; + inherit (rclone.meta) license platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e2d041a2edd8..82085373e9a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21877,6 +21877,8 @@ with pkgs; libqt5pas = libsForQt5.callPackage ../development/compilers/fpc/libqt5pas.nix { }; + librclone = callPackage ../development/libraries/librclone { }; + libroxml = callPackage ../development/libraries/libroxml { }; librsvg = callPackage ../development/libraries/librsvg { From ea0070a5189adcd3e16bd15f0609d34b5abbbcfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 9 Feb 2023 16:54:30 -0800 Subject: [PATCH 173/174] celeste: init at 0.4.6 --- .../networking/sync/celeste/default.nix | 114 ++++++++++++++++++ .../sync/celeste/librclone-path.patch | 31 +++++ .../networking/sync/celeste/target-dir.patch | 16 +++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 163 insertions(+) create mode 100644 pkgs/applications/networking/sync/celeste/default.nix create mode 100644 pkgs/applications/networking/sync/celeste/librclone-path.patch create mode 100644 pkgs/applications/networking/sync/celeste/target-dir.patch diff --git a/pkgs/applications/networking/sync/celeste/default.nix b/pkgs/applications/networking/sync/celeste/default.nix new file mode 100644 index 000000000000..701172cbd28b --- /dev/null +++ b/pkgs/applications/networking/sync/celeste/default.nix @@ -0,0 +1,114 @@ +{ lib +, stdenv +, rust +, rustPlatform +, fetchFromGitHub +, substituteAll +, fetchpatch +, pkg-config +, wrapGAppsHook4 +, cairo +, gdk-pixbuf +, glib +, graphene +, gtk3 +, gtk4 +, libadwaita +, libappindicator-gtk3 +, librclone +, pango +, rclone +}: + +let + # https://github.com/trevyn/librclone/pull/8 + librclone-mismatched-types-patch = fetchpatch { + name = "use-c_char-to-be-platform-independent.patch"; + url = "https://github.com/trevyn/librclone/commit/91fdf3fa5f5eea0dfd06981ba72e09034974fdad.patch"; + hash = "sha256-8YDyUNP/ISP5jCliT6UCxZ89fdRFud+6u6P29XdPy58="; + }; +in rustPlatform.buildRustPackage rec { + pname = "celeste"; + version = "0.4.6"; + + src = fetchFromGitHub { + owner = "hwittenborn"; + repo = "celeste"; + rev = "v${version}"; + hash = "sha256-VEyQlycpqsGKqtV/QvqBfVHqQhl/H6HsWPRDBtQO3qM="; + }; + + cargoHash = "sha256-fqt0XklJJAXi2jO7eo0tIwRo2Y3oM56qYwoaelKY8iU="; + + patches = [ + (substituteAll { + src = ./target-dir.patch; + rustTarget = rust.toRustTarget stdenv.hostPlatform; + }) + ]; + + postPatch = '' + pushd $cargoDepsCopy/librclone-sys + oldHash=$(sha256sum build.rs | cut -d " " -f 1) + patch -p2 < ${./librclone-path.patch} + substituteInPlace build.rs \ + --subst-var-by librclone ${librclone} + substituteInPlace .cargo-checksum.json \ + --replace $oldHash $(sha256sum build.rs | cut -d " " -f 1) + popd + pushd $cargoDepsCopy/librclone + oldHash=$(sha256sum src/lib.rs | cut -d " " -f 1) + patch -p1 < ${librclone-mismatched-types-patch} + substituteInPlace .cargo-checksum.json \ + --replace $oldHash $(sha256sum src/lib.rs | cut -d " " -f 1) + popd + ''; + + # Cargo.lock is outdated + preConfigure = '' + cargo update --offline + ''; + + # We need to build celeste-tray first because celeste/src/launch.rs reads that file at build time. + # Upstream does the same: https://github.com/hwittenborn/celeste/blob/765dfa2/justfile#L1-L3 + cargoBuildFlags = [ "--bin" "celeste-tray" ]; + postConfigure = '' + cargoBuildHook + cargoBuildFlags= + ''; + + RUSTC_BOOTSTRAP = 1; + + nativeBuildInputs = [ + pkg-config + rustPlatform.bindgenHook + wrapGAppsHook4 + ]; + + buildInputs = [ + cairo + gdk-pixbuf + glib + graphene + gtk3 + gtk4 + libadwaita + librclone + pango + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libappindicator-gtk3 ]}" + --prefix PATH : "${lib.makeBinPath [ rclone ]}" + ) + ''; + + meta = { + changelog = "https://github.com/hwittenborn/celeste/blob/${src.rev}/CHANGELOG.md"; + description = "GUI file synchronization client that can sync with any cloud provider"; + homepage = "https://github.com/hwittenborn/celeste"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/applications/networking/sync/celeste/librclone-path.patch b/pkgs/applications/networking/sync/celeste/librclone-path.patch new file mode 100644 index 000000000000..21af74dfde51 --- /dev/null +++ b/pkgs/applications/networking/sync/celeste/librclone-path.patch @@ -0,0 +1,31 @@ +diff --git a/librclone-sys/build.rs b/librclone-sys/build.rs +index 10e45bc..7d04c08 100644 +--- a/librclone-sys/build.rs ++++ b/librclone-sys/build.rs +@@ -16,15 +16,8 @@ fn main() { + println!("cargo:rerun-if-changed=go.mod"); + println!("cargo:rerun-if-changed=go.sum"); + +- Command::new("go") +- .args(["build", "--buildmode=c-archive", "-o"]) +- .arg(&format!("{}/librclone.a", out_dir)) +- .arg("github.com/rclone/rclone/librclone") +- .status() +- .expect("`go build` failed. Is `go` installed and latest version?"); +- +- println!("cargo:rustc-link-search=native={}", out_dir); +- println!("cargo:rustc-link-lib=static=rclone"); ++ println!("cargo:rustc-link-search=native={}", "@librclone@/lib"); ++ println!("cargo:rustc-link-lib=dylib=rclone"); + + if target_triple.ends_with("darwin") { + println!("cargo:rustc-link-lib=framework=CoreFoundation"); +@@ -32,7 +25,7 @@ fn main() { + } + + let bindings = bindgen::Builder::default() +- .header(format!("{}/librclone.h", out_dir)) ++ .header(format!("{}/librclone.h", "@librclone@/include")) + .allowlist_function("RcloneRPC") + .allowlist_function("RcloneInitialize") + .allowlist_function("RcloneFinalize") diff --git a/pkgs/applications/networking/sync/celeste/target-dir.patch b/pkgs/applications/networking/sync/celeste/target-dir.patch new file mode 100644 index 000000000000..a8da72e77f77 --- /dev/null +++ b/pkgs/applications/networking/sync/celeste/target-dir.patch @@ -0,0 +1,16 @@ +diff --git a/celeste/src/launch.rs b/celeste/src/launch.rs +index 5227170..e3cf189 100644 +--- a/celeste/src/launch.rs ++++ b/celeste/src/launch.rs +@@ -172,10 +172,7 @@ impl TrayApp { + perms.set_mode(0o755); + file.set_permissions(perms).unwrap(); + +- #[cfg(debug_assertions)] +- let tray_file = include_bytes!("../../target/debug/celeste-tray"); +- #[cfg(not(debug_assertions))] +- let tray_file = include_bytes!("../../target/release/celeste-tray"); ++ let tray_file = include_bytes!(concat!("../../target/@rustTarget@/", env!("cargoBuildType"), "/celeste-tray")); + + file.write_all(tray_file).unwrap(); + drop(file); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82085373e9a3..ac5d63845a59 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28895,6 +28895,8 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Carbon; }; + celeste = callPackage ../applications/networking/sync/celeste { }; + cyan = callPackage ../applications/graphics/cyan {}; cyanrip = callPackage ../applications/audio/cyanrip { }; From 55544a3fd9ec7b018281b20ec0b0c8f29a1b46c3 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 9 Mar 2023 09:02:41 +1000 Subject: [PATCH 174/174] gh: 2.23.0 -> 2.24.0 Diff: https://github.com/cli/cli/compare/v2.23.0...v2.24.0 Changelog: https://github.com/cli/cli/releases/tag/v2.24.0 --- pkgs/applications/version-management/gh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gh/default.nix b/pkgs/applications/version-management/gh/default.nix index 3f154f0350c4..5bf5caf262c6 100644 --- a/pkgs/applications/version-management/gh/default.nix +++ b/pkgs/applications/version-management/gh/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gh"; - version = "2.23.0"; + version = "2.24.0"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - hash = "sha256-91TmPIjFOCeZmbobn3mIJis5qofJFmNGuX19+Cyo8Ck="; + hash = "sha256-5ccvdm0BQZ0+yccB+TjlVt5ZAPxKuEInOed2D9AzMjc="; }; - vendorHash = "sha256-NiXC0ooUkAqFCLp3eRBpryazQU94gSnw0gYFwQNeCo4="; + vendorHash = "sha256-nn2DzjcXHiuSaiEuWNZTAZ3+OKrEpRzUPzqmH+gZ9sY="; nativeBuildInputs = [ installShellFiles ];