From a8ba09146cb47795cf95dc4a2fd7f0ebc6b282f5 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 4 Oct 2022 20:37:56 +0200 Subject: [PATCH 01/62] sienna: 1.0c -> 1.0d --- pkgs/games/sienna/default.nix | 25 +++++++++++-------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/pkgs/games/sienna/default.nix b/pkgs/games/sienna/default.nix index 37138f152b6a..c6f8db0ea9e7 100644 --- a/pkgs/games/sienna/default.nix +++ b/pkgs/games/sienna/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchurl, love, lua, makeWrapper, makeDesktopItem }: +{ lib, stdenv, fetchurl, love, makeWrapper, makeDesktopItem, copyDesktopItems }: stdenv.mkDerivation rec { pname = "sienna"; - version = "1.0c"; + version = "1.0d"; + src = fetchurl { url = "https://github.com/SimonLarsen/${pname}/releases/download/v${version}/${pname}-${version}.love"; - sha256 = "1x15276fhqspgrrv8fzkp032i2qa8piywc0yy061x59mxhdndzj6"; + sha256 = "sha256-1bFjhN7jL/PMYMJH1ete6uyHTYsTGgoP60sf/sJTLlU="; }; icon = fetchurl { @@ -13,7 +14,7 @@ stdenv.mkDerivation rec { sha256 = "12q2rhk39dmb6ir50zafn8dylaad5gns8z3y21mfjabc5l5g02nn"; }; - desktopItem = makeDesktopItem { + desktopItems = [ (makeDesktopItem { name = "sienna"; exec = pname; icon = icon; @@ -21,33 +22,29 @@ stdenv.mkDerivation rec { desktopName = "Sienna"; genericName = "sienna"; categories = [ "Game" ]; - }; + }) ]; - nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ lua love ]; + nativeBuildInputs = [ makeWrapper copyDesktopItems ]; dontUnpack = true; - installPhase = - '' + installPhase = '' + runHook preInstall mkdir -p $out/bin mkdir -p $out/share/games/lovegames cp -v $src $out/share/games/lovegames/${pname}.love makeWrapper ${love}/bin/love $out/bin/${pname} --add-flags $out/share/games/lovegames/${pname}.love - - chmod +x $out/bin/${pname} - mkdir -p $out/share/applications - ln -s ${desktopItem}/share/applications/* $out/share/applications/ + runHook postInstall ''; meta = with lib; { description = "Fast-paced one button platformer"; + homepage = "https://tangramgames.dk/games/sienna"; maintainers = with maintainers; [ leenaars ]; platforms = platforms.linux; license = licenses.free; - downloadPage = "http://tangramgames.dk/games/sienna"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 543737314c1e..70a6d08e54ae 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34095,7 +34095,7 @@ with pkgs; openssl = openssl_1_1; }; - sienna = callPackage ../games/sienna { love = love_0_10; }; + sienna = callPackage ../games/sienna { }; sil = callPackage ../games/sil { }; From d421186dc5ba39963d4b37ef0bfb9dda49d0ba4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 26 Oct 2022 17:07:16 +0200 Subject: [PATCH 02/62] onmetal-image: init at unstable-2022-09-28 --- .../virtualization/onmetal-image/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/tools/virtualization/onmetal-image/default.nix diff --git a/pkgs/tools/virtualization/onmetal-image/default.nix b/pkgs/tools/virtualization/onmetal-image/default.nix new file mode 100644 index 000000000000..7ae6c6f89e09 --- /dev/null +++ b/pkgs/tools/virtualization/onmetal-image/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, installShellFiles +}: + +buildGoModule rec { + pname = "onmetal-image"; + version = "unstable-2022-09-28"; + + src = fetchFromGitHub { + owner = "onmetal"; + repo = "onmetal-image"; + rev = "26f6ac2607e1cac19c35fac94aa8cd963b19628a"; + sha256 = "sha256-ITUm7CEaz8X7LhArGJXk4YKQcX+kOvju6Go+fGfFOcw="; + }; + + vendorSha256 = "sha256-ISDNqXoJEYy6kfCZGqHoie0jMOw9bgjYGHqBGx6mymc="; + + subPackages = [ "cmd" ]; + + nativeBuildInputs = [ + installShellFiles + ]; + + postInstall = '' + mv $out/bin/cmd $out/bin/onmetal-image + + installShellCompletion --cmd onmetal-image \ + --bash <($out/bin/onmetal-image completion bash) \ + --fish <($out/bin/onmetal-image completion fish) \ + --zsh <($out/bin/onmetal-image completion zsh) + ''; + + meta = with lib; { + description = "Onmetal OCI Image Specification, Library and Tooling"; + homepage = "https://github.com/onmetal/onmetal-image"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a3a1dc02dc13..0a94df5966ff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -30465,6 +30465,8 @@ with pkgs; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; + onmetal-image = callPackage ../tools/virtualization/onmetal-image { }; + opcr-policy = callPackage ../development/tools/opcr-policy { }; open-policy-agent = callPackage ../development/tools/open-policy-agent { }; From 0c5416604e86972c4e150238ae55d140ed2132fa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 4 Nov 2022 01:09:15 +0100 Subject: [PATCH 03/62] strace-analyzer: init at 0.5.1 --- .../tools/misc/strace-analyzer/default.nix | 28 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/tools/misc/strace-analyzer/default.nix diff --git a/pkgs/development/tools/misc/strace-analyzer/default.nix b/pkgs/development/tools/misc/strace-analyzer/default.nix new file mode 100644 index 000000000000..95b1a5cc12a8 --- /dev/null +++ b/pkgs/development/tools/misc/strace-analyzer/default.nix @@ -0,0 +1,28 @@ +{ lib +, rustPlatform +, fetchFromGitHub +, strace +}: + +rustPlatform.buildRustPackage rec { + pname = "strace-analyzer"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "wookietreiber"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-ICUXedWg7ZT2Uzk7ZLpFqoEXiG4AzvkwCndR2aHKjVI="; + }; + + cargoSha256 = "sha256-p/HYG/KaHtvgvAd+eg1fKmDnLoWCL+XiT66jRBU2xRE="; + + checkInputs = [ strace ]; + + meta = with lib; { + description = "Analyzes strace output"; + homepage = "https://github.com/wookietreiber/strace-analyzer"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c07dc208d932..9b5f1c5040a0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17719,6 +17719,8 @@ with pkgs; strace = callPackage ../development/tools/misc/strace { }; + strace-analyzer = callPackage ../development/tools/misc/strace-analyzer { }; + stylua = callPackage ../development/tools/stylua { }; summon = callPackage ../development/tools/summon { }; From e43e91a2a25a00141c9c35a6e498c55580304955 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 5 Nov 2022 18:35:20 +0100 Subject: [PATCH 04/62] upx: apply patch for CVE-2021-20285 Did not bump to 4.0.0 yet because the 4.0.0 release is affected by CVE-2021-30500 and CVE-2021-30501. The patch for CVE-2021-30500 does not apply cleanly on top of 4.0.0. --- pkgs/tools/compression/upx/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/compression/upx/default.nix b/pkgs/tools/compression/upx/default.nix index aff00402ed97..c556f31e6918 100644 --- a/pkgs/tools/compression/upx/default.nix +++ b/pkgs/tools/compression/upx/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, ucl, zlib, perl }: +{ lib, stdenv, fetchurl, ucl, zlib, perl, fetchpatch }: stdenv.mkDerivation rec { pname = "upx"; @@ -10,6 +10,14 @@ stdenv.mkDerivation rec { buildInputs = [ ucl zlib perl ]; + patches = [ + (fetchpatch { + url = "https://github.com/upx/upx/commit/13bc031163863cb3866aa6cdc018dff0697aa5d4.patch"; + sha256 = "sha256-7uazgx1lOgHh2J7yn3yb1q9lTJsv4BbexdGlWRiAG/M="; + name = "CVE-2021-20285.patch"; + }) + ]; + preConfigure = '' export UPX_UCLDIR=${ucl} ''; From 3997a524992d207ad1a8178bb526f4921b14106c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 7 Nov 2022 20:20:27 +0100 Subject: [PATCH 05/62] element: remove piwiki disabling Piwiki support got removed half a year ago in https://github.com/vector-im/element-web/commit/6c375748576f4e991f2ed638de119eb1611fa4b8 --- .../networking/instant-messengers/element/element-web.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 864c70f1917b..6af1c2ec738a 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -16,7 +16,6 @@ let pinData = lib.importJSON ./pin.json; noPhoningHome = { disable_guests = true; # disable automatic guest account registration at matrix.org - piwik = false; # disable analytics }; unwrapped = stdenv.mkDerivation rec { From 936bcaf7327e02dfebbeaeb5ab537dfd2109bc6f Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 7 Nov 2022 23:30:00 +0100 Subject: [PATCH 06/62] maintainers: add nagy --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 99907a6877f8..b7e2f403d512 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9571,6 +9571,15 @@ githubId = 6783654; name = "Nadrieril Feneanar"; }; + nagy = { + email = "danielnagy@posteo.de"; + github = "nagy"; + githubId = 692274; + name = "Daniel Nagy"; + keys = [{ + fingerprint = "F6AE 2C60 9196 A1BC ECD8 7108 1B8E 8DCB 576F B671"; + }]; + }; nalbyuites = { email = "ashijit007@gmail.com"; github = "nalbyuites"; From d190c70591b802a5160951d264d65b22bbdded70 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 7 Nov 2022 23:30:00 +0100 Subject: [PATCH 07/62] freenet: build01480 -> build01494 --- .../networking/p2p/freenet/default.nix | 62 ++++++++----------- .../networking/p2p/freenet/freenetWrapper | 19 +++--- pkgs/top-level/all-packages.nix | 4 +- 3 files changed, 37 insertions(+), 48 deletions(-) diff --git a/pkgs/applications/networking/p2p/freenet/default.nix b/pkgs/applications/networking/p2p/freenet/default.nix index a08ea4b8bbc2..b8f64aba2ec3 100644 --- a/pkgs/applications/networking/p2p/freenet/default.nix +++ b/pkgs/applications/networking/p2p/freenet/default.nix @@ -1,72 +1,64 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, ant, jdk, bash, coreutils, substituteAll }: +{ lib, stdenv, fetchurl, jdk, bash, coreutils, substituteAll }: let + version = "build01494"; + jna = fetchurl { + url = "https://github.com/freenet/fred/releases/download/${version}/jna-4.5.2.jar"; + sha256 = "sha256-DI63rPZyYWVteQBRkd66ujtr9d1gpDc1okVCk4Hb7P8="; + }; + jna_platform = fetchurl { + url = "https://github.com/freenet/fred/releases/download/${version}/jna-platform-4.5.2.jar"; + sha256 = "sha256-8dAMFn2JIcbiPGJu+fHDrgvkc8lcaP+gErx65VqH4tY="; + }; freenet_ext = fetchurl { - url = "https://downloads.freenetproject.org/latest/freenet-ext.jar"; - sha256 = "17ypljdvazgx2z6hhswny1lxfrknysz3x6igx8vl3xgdpvbb7wij"; + url = "https://github.com/freenet/fred/releases/download/${version}/freenet-ext.jar"; + sha256 = "sha256-MvKz1r7t9UE36i+aPr72dmbXafCWawjNF/19tZuk158="; }; - - bcprov_version = "jdk15on-154"; bcprov = fetchurl { - url = "https://www.bouncycastle.org/download/bcprov-ext-${bcprov_version}.jar"; - sha256 = "0abmhg2h44g8c5p7skzqwfxj8xwcjh9vs84mc0hr78k1am0633jk"; + url = "https://github.com/freenet/fred/releases/download/${version}/bcprov-jdk15on-1.59.jar"; + sha256 = "sha256-HDHkTjMdJeRtKTs+juLQcCimfbAR50yyRDKFrtHVnIU="; }; seednodes = fetchurl { url = "https://downloads.freenetproject.org/alpha/opennet/seednodes.fref"; sha256 = "08awwr8n80b4cdzzb3y8hf2fzkr1f2ly4nlq779d6pvi5jymqdvv"; }; - version = "build01480"; freenet-jars = stdenv.mkDerivation { pname = "freenet-jars"; inherit version; - src = fetchFromGitHub { - owner = "freenet"; - repo = "fred"; - rev = version; - sha256 = "0wddkfyhsgs7bcq9svicz6l0a35yv82yqzmji3c345hg4hbch3kb"; + src = fetchurl { + url = "https://github.com/freenet/fred/releases/download/${version}/freenet.jar"; + sha256 = "sha256-1Pjc8Ob4EN7N05QkGTMKBn7z3myTDaQ98N48nNSLstg="; }; - patchPhase = '' - cp ${freenet_ext} lib/freenet/freenet-ext.jar - cp ${bcprov} lib/bcprov-${bcprov_version}.jar - - sed '/antcall.*-ext/d' -i build.xml - sed 's/@unknown@/${version}/g' -i build-clean.xml - ''; - - buildInputs = [ ant jdk ]; - - buildPhase = "ant package-only"; + dontUnpack = true; installPhase = '' mkdir -p $out/share/freenet - cp lib/bcprov-${bcprov_version}.jar $out/share/freenet - cp lib/freenet/freenet-ext.jar $out/share/freenet - cp dist/freenet.jar $out/share/freenet + ln -s ${bcprov} $out/share/freenet/bcprov.jar + ln -s ${freenet_ext} $out/share/freenet/freenet-ext.jar + ln -s ${jna_platform} $out/share/freenet/jna_platform.jar + ln -s ${jna} $out/share/freenet/jna.jar + ln -s $src $out/share/freenet/freenet.jar ''; }; in stdenv.mkDerivation { - name = "freenet-${version}"; + pname = "freenet"; inherit version; src = substituteAll { src = ./freenetWrapper; - inherit bash coreutils seednodes bcprov_version; + inherit bash coreutils jdk seednodes; freenet = freenet-jars; - jre = jdk.jre; }; - jars = freenet-jars; - dontUnpack = true; installPhase = '' mkdir -p $out/bin - cp $src $out/bin/freenet - chmod +x $out/bin/freenet + install -Dm555 $src $out/bin/freenet ln -s ${freenet-jars}/share $out/share ''; @@ -75,7 +67,7 @@ in stdenv.mkDerivation { homepage = "https://freenetproject.org/"; sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; license = lib.licenses.gpl2Plus; - maintainers = [ ]; + maintainers = with lib.maintainers; [ nagy ]; platforms = with lib.platforms; linux; }; } diff --git a/pkgs/applications/networking/p2p/freenet/freenetWrapper b/pkgs/applications/networking/p2p/freenet/freenetWrapper index f3106265801f..76faf601e69c 100755 --- a/pkgs/applications/networking/p2p/freenet/freenetWrapper +++ b/pkgs/applications/networking/p2p/freenet/freenetWrapper @@ -1,18 +1,17 @@ #! @bash@/bin/bash - +set -eo pipefail PATH=@coreutils@/bin:$PATH +export CLASSPATH=@freenet@/share/freenet/bcprov.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/jna_platform.jar:@freenet@/share/freenet/jna.jar:@freenet@/share/freenet/freenet.jar export FREENET_HOME="$HOME/.local/share/freenet" -if [ -n "$XDG_DATA_HOME" ] - then export FREENET_HOME="$XDG_DATA_HOME/freenet" +if [ -n "$XDG_DATA_HOME" ] ; then + FREENET_HOME="$XDG_DATA_HOME/freenet" fi -if [ ! -d $FREENET_HOME ]; then - mkdir -p $FREENET_HOME -fi +mkdir -p -- $FREENET_HOME -cp -u @seednodes@ $FREENET_HOME/seednodes.fref -chmod u+rw $FREENET_HOME/seednodes.fref +cp -u -- @seednodes@ $FREENET_HOME/seednodes.fref +chmod u+rw -- $FREENET_HOME/seednodes.fref -cd $FREENET_HOME -@jre@/bin/java -cp @freenet@/share/freenet/bcprov-@bcprov_version@.jar:@freenet@/share/freenet/freenet-ext.jar:@freenet@/share/freenet/freenet.jar -Xmx1024M freenet.node.NodeStarter +cd -- $FREENET_HOME +exec @jdk@/bin/java -Xmx1024M freenet.node.NodeStarter "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f256b1dca632..65cc70f4b42a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28731,9 +28731,7 @@ with pkgs; jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - freenet = callPackage ../applications/networking/p2p/freenet { - jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 - }; + freenet = callPackage ../applications/networking/p2p/freenet { }; freeoffice = callPackage ../applications/office/softmaker/freeoffice.nix {}; From ba3f3b73ad1a4ef881936ee0a3ebb3e745d2760a Mon Sep 17 00:00:00 2001 From: Florian Brandes Date: Sun, 13 Nov 2022 20:13:15 +0100 Subject: [PATCH 08/62] sqlite3-to-mysql: init at 1.4.16 Signed-off-by: Florian Brandes --- nixos/tests/all-tests.nix | 1 + nixos/tests/sqlite3-to-mysql.nix | 65 ++++++++++++++++++++ pkgs/tools/misc/sqlite3-to-mysql/default.nix | 50 +++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 118 insertions(+) create mode 100644 nixos/tests/sqlite3-to-mysql.nix create mode 100644 pkgs/tools/misc/sqlite3-to-mysql/default.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index c7aa9ed78ba4..dd5acbda39a8 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -581,6 +581,7 @@ in { sourcehut = handleTest ./sourcehut.nix {}; spacecookie = handleTest ./spacecookie.nix {}; spark = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./spark {}; + sqlite3-to-mysql = handleTest ./sqlite3-to-mysql.nix {}; sslh = handleTest ./sslh.nix {}; sssd = handleTestOn ["x86_64-linux"] ./sssd.nix {}; sssd-ldap = handleTestOn ["x86_64-linux"] ./sssd-ldap.nix {}; diff --git a/nixos/tests/sqlite3-to-mysql.nix b/nixos/tests/sqlite3-to-mysql.nix new file mode 100644 index 000000000000..029058187df3 --- /dev/null +++ b/nixos/tests/sqlite3-to-mysql.nix @@ -0,0 +1,65 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: + +/* + This test suite replaces the typical pytestCheckHook function in + sqlite3-to-mysql due to the need of a running mysql instance. +*/ + +{ + name = "sqlite3-to-mysql"; + meta.maintainers = with lib.maintainers; [ gador ]; + + nodes.machine = { pkgs, ... }: { + environment.systemPackages = with pkgs; [ + sqlite3-to-mysql + # create one coherent python environment + (python3.withPackages + (ps: sqlite3-to-mysql.propagatedBuildInputs ++ + [ + python3Packages.pytest + python3Packages.pytest-mock + python3Packages.pytest-timeout + python3Packages.factory_boy + python3Packages.docker # only needed so import does not fail + sqlite3-to-mysql + ]) + ) + ]; + services.mysql = { + package = pkgs.mariadb; + enable = true; + # from https://github.com/techouse/sqlite3-to-mysql/blob/master/tests/conftest.py + # and https://github.com/techouse/sqlite3-to-mysql/blob/master/.github/workflows/test.yml + initialScript = pkgs.writeText "mysql-init.sql" '' + create database test_db DEFAULT CHARACTER SET utf8mb4; + create user tester identified by 'testpass'; + grant all on test_db.* to tester; + create user tester@localhost identified by 'testpass'; + grant all on test_db.* to tester@localhost; + ''; + settings = { + mysqld = { + character-set-server = "utf8mb4"; + collation-server = "utf8mb4_unicode_ci"; + log_warnings = 1; + }; + }; + }; + }; + + testScript = '' + machine.wait_for_unit("mysql") + + machine.succeed( + "sqlite3mysql --version | grep ${pkgs.sqlite3-to-mysql.version}" + ) + + # invalid_database_name: assert '1045 (28000): Access denied' in "1044 (42000): Access denied [...] + # invalid_database_user: does not return non-zero exit for some reason + # test_version: has problems importing sqlite3_to_mysql and determining the version + machine.succeed( + "cd ${pkgs.sqlite3-to-mysql.src} \ + && pytest -v --no-docker -k \"not test_invalid_database_name and not test_invalid_database_user and not test_version\"" + ) + ''; +}) diff --git a/pkgs/tools/misc/sqlite3-to-mysql/default.nix b/pkgs/tools/misc/sqlite3-to-mysql/default.nix new file mode 100644 index 000000000000..cb16a93dd207 --- /dev/null +++ b/pkgs/tools/misc/sqlite3-to-mysql/default.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, python3Packages +, nixosTests +}: + +python3Packages.buildPythonApplication rec { + pname = "sqlite3-to-mysql"; + version = "1.4.16"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "techouse"; + repo = pname; + rev = "refs/tags/v${version}"; + hash = "sha256-Fxt1zOyEnBuMkCLCABfijo0514NbFocdsjrQU43qVhY="; + }; + + propagatedBuildInputs = with python3Packages; [ + click + mysql-connector + pytimeparse + pymysql + pymysqlsa + six + simplejson + sqlalchemy + sqlalchemy-utils + tqdm + tabulate + unidecode + packaging + ]; + + # tests require a mysql server instance + doCheck = false; + + # run package tests as a seperate nixos test + passthru.tests = { + nixosTest = nixosTests.sqlite3-to-mysql; + }; + + + meta = with lib; { + description = "A simple Python tool to transfer data from SQLite 3 to MySQL"; + homepage = "https://github.com/techouse/sqlite3-to-mysql"; + license = licenses.mit; + maintainers = with maintainers; [ gador ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9501acb83143..902a19e99817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11584,6 +11584,8 @@ with pkgs; sqliteman = callPackage ../applications/misc/sqliteman { }; + sqlite3-to-mysql = callPackage ../tools/misc/sqlite3-to-mysql { }; + sqls = callPackage ../applications/misc/sqls { }; stdman = callPackage ../data/documentation/stdman { }; From b1a9d5fefc0d647de19f6799719cc3c6e4872352 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Wed, 16 Nov 2022 00:24:50 +0100 Subject: [PATCH 09/62] python310Packages.textwrap3: cleanup checkInputs --- .../python-modules/textwrap3/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/textwrap3/default.nix b/pkgs/development/python-modules/textwrap3/default.nix index 995a62230b22..afbc9ce83904 100644 --- a/pkgs/development/python-modules/textwrap3/default.nix +++ b/pkgs/development/python-modules/textwrap3/default.nix @@ -1,10 +1,7 @@ { lib , buildPythonPackage , fetchPypi -, tox -, pytest -, coverage -, pytest-cov +, pytestCheckHook }: buildPythonPackage rec { @@ -18,16 +15,9 @@ buildPythonPackage rec { }; checkInputs = [ - tox - pytest - coverage - pytest-cov + pytestCheckHook ]; - checkPhase = '' - pytest - ''; - meta = with lib; { description = "Textwrap from Python 3.6 backport plus a few tweaks"; homepage = "https://github.com/jonathaneunice/textwrap3"; From fafbbb3c08a0770b9e5390b234010f772e204a79 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Mon, 19 Sep 2022 10:21:24 +0200 Subject: [PATCH 10/62] gammastep: 2.0.8 -> 2.0.9 --- pkgs/applications/misc/redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 6dbe3d840415..10bb6a782707 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -123,13 +123,13 @@ rec { gammastep = mkRedshift rec { pname = "gammastep"; - version = "2.0.8"; + version = "2.0.9"; src = fetchFromGitLab { owner = "chinstrap"; repo = pname; rev = "v${version}"; - sha256 = "071f3iqdbblb3awnx48j19kspk6l2g3658za80i2mf4gacgq9fm1"; + sha256 = "sha256-EdVLBBIEjMu+yy9rmcxQf4zdW47spUz5SbBDbhmLjOU="; }; meta = redshift.meta // { From dd5ba982a6c93eeb5a761b5c5e7f874d15bd963f Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 22 Nov 2022 16:28:21 +0100 Subject: [PATCH 11/62] python3Packages.plum-py: 0.4.0 -> 0.8.5 --- pkgs/development/python-modules/plum-py/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/plum-py/default.nix b/pkgs/development/python-modules/plum-py/default.nix index 50a33266c8fa..5b963cbfef4e 100644 --- a/pkgs/development/python-modules/plum-py/default.nix +++ b/pkgs/development/python-modules/plum-py/default.nix @@ -2,20 +2,17 @@ buildPythonPackage rec { pname = "plum-py"; - version = "0.4.0"; + version = "0.8.5"; disabled = !isPy3k; src = fetchFromGitLab { owner = "dangass"; repo = "plum"; - rev = "6a9ff863c0e9fa21f7b2230d25402155a5522e4b"; - sha256 = "1iv62yb704c61b0dvsmyp3j6xpbmay532g9ny4pw4zbg3l69vd5j"; + rev = version; + sha256 = "sha256-jCZUNT1HpSr0khHsjnxEzN2LCzcDV6W27PjVkwFJHUg="; }; - postPatch = '' - substituteInPlace src/plum/int/flag/_flag.py \ - --replace 'if sys.version_info < (3, 7):' 'if True:' - ''; + pythonImportsCheck = [ "plum" ]; checkInputs = [ pytest baseline ]; checkPhase = "pytest tests"; From 2b0b18b1703e50b97f68d45938eab7d32304ea9f Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Tue, 22 Nov 2022 16:25:23 +0100 Subject: [PATCH 12/62] python3Packages.exif: 1.2.0 -> 1.3.5 --- pkgs/development/python-modules/exif/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/exif/default.nix b/pkgs/development/python-modules/exif/default.nix index 2c549030e6d7..da4ba40a9246 100644 --- a/pkgs/development/python-modules/exif/default.nix +++ b/pkgs/development/python-modules/exif/default.nix @@ -2,25 +2,22 @@ buildPythonPackage rec { pname = "exif"; - version = "1.2.0"; + version = "1.3.5"; disabled = !isPy3k; src = fetchFromGitLab { owner = "TNThieding"; repo = "exif"; - rev = "686857c677f489759db90b1ad61fa1cc1cac5f9a"; - sha256 = "0z2if23kmi0iyxviz32mlqs997i3dqpqfz6nznlwkhkkb6rkwwnh"; + rev = "v${version}"; + sha256 = "sha256-XSORawioXo8oPVZ3Jnxqa6GFIxnQZMT0vJitdmpBj0E="; }; propagatedBuildInputs = [ plum-py ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "plum-py==0.3.1" "plum-py>=0.3.1" - ''; - checkInputs = [ pytestCheckHook baseline ]; + pythonImportsCheck = [ "exif" ]; + meta = with lib; { description = "Read and modify image EXIF metadata using Python"; homepage = "https://gitlab.com/TNThieding/exif"; From 4682f63a73d0e4666a65c0ec03dc62a58328cfac Mon Sep 17 00:00:00 2001 From: David Morgan Date: Wed, 23 Nov 2022 07:48:52 +0000 Subject: [PATCH 13/62] maintainers: add deejayem --- maintainers/maintainer-list.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bfd89bd6fa51..455d59ee7add 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3288,6 +3288,15 @@ fingerprint = "4E35 F2E5 2132 D654 E815 A672 DB2C BC24 2868 6000"; }]; }; + deejayem = { + email = "nixpkgs.bu5hq@simplelogin.com"; + github = "deejayem"; + githubId = 2564003; + name = "David Morgan"; + keys = [{ + fingerprint = "9B43 6B14 77A8 79C2 6CDB 6604 C171 2510 02C2 00F2"; + }]; + }; deepfire = { email = "_deepfire@feelingofgreen.ru"; github = "deepfire"; From b40da0c8f5cfdda145e3957199a43ea7f8cd36ac Mon Sep 17 00:00:00 2001 From: David Morgan Date: Thu, 24 Nov 2022 21:33:57 +0000 Subject: [PATCH 14/62] zsh-forgit: init at 22.11.0 --- pkgs/shells/zsh/zsh-forgit/default.nix | 35 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/shells/zsh/zsh-forgit/default.nix diff --git a/pkgs/shells/zsh/zsh-forgit/default.nix b/pkgs/shells/zsh/zsh-forgit/default.nix new file mode 100644 index 000000000000..01dc6874cc46 --- /dev/null +++ b/pkgs/shells/zsh/zsh-forgit/default.nix @@ -0,0 +1,35 @@ +{ stdenv, lib, fetchFromGitHub, git, fzf }: + +stdenv.mkDerivation rec { + pname = "zsh-forgit"; + version = "22.11.0"; + + src = fetchFromGitHub { + owner = "wfxr"; + repo = "forgit"; + rev = version; + sha256 = "ca7EM/F0Spsdr3MbjIVwbjLVXg6/qWGczBQHLCcpU5A="; + }; + + strictDeps = true; + + postPatch = '' + substituteInPlace forgit.plugin.zsh \ + --replace "fzf " "${fzf}/bin/fzf " \ + --replace "git " "${git}/bin/git " + ''; + + dontBuild = true; + + installPhase = '' + install -D forgit.plugin.zsh $out/share/zsh/${pname}/forgit.plugin.zsh + ''; + + meta = with lib; { + homepage = "https://github.com/wfxr/forgit"; + description = "A utility tool powered by fzf for using git interactively"; + license = licenses.mit; + maintainers = with maintainers; [ deejayem ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fcb049f54fc0..43b64c73031f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13249,6 +13249,8 @@ with pkgs; zsh-fast-syntax-highlighting = callPackage ../shells/zsh/zsh-fast-syntax-highlighting { }; + zsh-forgit = callPackage ../shells/zsh/zsh-forgit { }; + zsh-fzf-tab = callPackage ../shells/zsh/zsh-fzf-tab { }; zsh-autocomplete = callPackage ../shells/zsh/zsh-autocomplete { }; From a8b76c097a55333e598fb61ccfbf8278136024ff Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 25 Nov 2022 09:27:38 +0100 Subject: [PATCH 15/62] php81: 8.1.12 -> 8.1.13 Changelog: https://www.php.net/ChangeLog-8.php#8.1.13 --- pkgs/development/interpreters/php/8.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.1.nix b/pkgs/development/interpreters/php/8.1.nix index 4b98f318062a..dc1b8c8581ef 100644 --- a/pkgs/development/interpreters/php/8.1.nix +++ b/pkgs/development/interpreters/php/8.1.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.1.12"; - hash = "sha256-+H1z6Rf6z3jee83lP8L6pNTb4Eh6lAbhq2jIro8z6wM="; + version = "8.1.13"; + hash = "sha256-k/z9+qo9CUoP2xjOCNIPINUm7j8HoUaoqOyCzgCyN8o="; }); in From aa634993cd03aff6c07f2d48d91f6b3ce97a1965 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Fri, 25 Nov 2022 09:28:02 +0100 Subject: [PATCH 16/62] php82: 8.2.0rc6 -> 8.2.0rc7 News: https://github.com/php/php-src/blob/php-8.2.0RC7/NEWS --- .../from_md/release-notes/rl-2211.section.xml | 2 +- nixos/doc/manual/release-notes/rl-2211.section.md | 14 +++++++------- pkgs/development/interpreters/php/8.2.nix | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index e4ed65984e67..2a58ac41161d 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -141,7 +141,7 @@ - PHP 8.2.0 RC 6 is available. + PHP 8.2.0 RC 7 is available. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 14a1de27e951..b46c46aaa5bb 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -57,7 +57,7 @@ In addition to numerous new and upgraded packages, this release has the followin `mod_php` usage we still enable `ZTS` (Zend Thread Safe). This has been a common practice for a long time in other distributions. -- PHP 8.2.0 RC 6 is available. +- PHP 8.2.0 RC 7 is available. - `protonup` has been aliased to and replaced by `protonup-ng` due to upstream not maintaining it. @@ -482,12 +482,12 @@ Available as [services.patroni](options.html#opt-services.patroni.enable). - Add udev rules for the Teensy family of microcontrollers. -- The Qt QML disk cache is now disabled by default. This fixes a - long-standing issue where updating Qt/KDE apps would sometimes cause - them to crash or behave strangely without explanation. Those concerned - about the small (~10%) performance hit to application startup can - re-enable the cache (and expose themselves to gremlins) by setting the - envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the +- The Qt QML disk cache is now disabled by default. This fixes a + long-standing issue where updating Qt/KDE apps would sometimes cause + them to crash or behave strangely without explanation. Those concerned + about the small (~10%) performance hit to application startup can + re-enable the cache (and expose themselves to gremlins) by setting the + envrionment variable `QML_FORCE_DISK_CACHE` to `1` using e.g. the `environment.sessionVariables` NixOS option. - systemd-oomd is enabled by default. Depending on which systemd units have diff --git a/pkgs/development/interpreters/php/8.2.nix b/pkgs/development/interpreters/php/8.2.nix index 72816da1d4b1..6ea49852a40e 100644 --- a/pkgs/development/interpreters/php/8.2.nix +++ b/pkgs/development/interpreters/php/8.2.nix @@ -1,13 +1,13 @@ { callPackage, lib, stdenv, fetchurl, ... }@_args: let - hash = "sha256-sbT8sIwle3OugXxqLZO3jKXlrOQsX1iH7WRH8G+nv8Y="; + hash = "sha256-MSBENMUl+F5k9manZvYjRDY3YWsYToZSQU9hmhJ8Xvc="; base = callPackage ./generic.nix (_args // { version = "8.2.0"; phpAttrsOverrides = attrs: attrs // { src = fetchurl { - url = "https://downloads.php.net/~sergey/php-8.2.0RC6.tar.xz"; + url = "https://downloads.php.net/~pierrick/php-8.2.0RC7.tar.xz"; inherit hash; }; }; From 0c540ad804af0e76c0be70b78d7cc9cb7c70ee73 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Tue, 8 Nov 2022 04:14:19 +0000 Subject: [PATCH 17/62] dockstarter: init at unstable-2022-10-26 Fixes #180060 --- .../virtualization/dockstarter/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/virtualization/dockstarter/default.nix diff --git a/pkgs/tools/virtualization/dockstarter/default.nix b/pkgs/tools/virtualization/dockstarter/default.nix new file mode 100644 index 000000000000..321722d753a3 --- /dev/null +++ b/pkgs/tools/virtualization/dockstarter/default.nix @@ -0,0 +1,43 @@ +{ bash +, coreutils +, fetchFromGitHub +, git +, lib +, makeWrapper +, ncurses +, stdenv +}: + +stdenv.mkDerivation rec { + pname = "dockstarter"; + version = "unstable-2022-10-26"; + + src = fetchFromGitHub { + owner = "ghostwriters"; + repo = pname; + rev = "a1b6b6e29aa135c2a61ea67ca05e9e034856ca08"; + hash = "sha256-G26DFme6YaizdE5oHBo/IqV+1quu07Bp+IykXtO/GgA="; + }; + + dontBuild = false; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 main.sh $out/bin/ds + wrapProgram $out/bin/ds --prefix PATH : ${lib.makeBinPath [ + bash + coreutils + git + ncurses + ]} + ''; + + meta = with lib; { + description = "DockSTARTer helps you get started with running apps in Docker."; + homepage = "https://dockstarter.com"; + license = licenses.mit; + maintainers = with maintainers; [ urandom ]; + mainProgram = "ds"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e0eae0abd0d..5fafd860dca3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27932,6 +27932,8 @@ with pkgs; docker-credential-helpers = callPackage ../tools/admin/docker-credential-helpers { }; + dockstarter = callPackage ../tools/virtualization/dockstarter {}; + doodle = callPackage ../applications/search/doodle { }; dr14_tmeter = callPackage ../applications/audio/dr14_tmeter { }; From 451fb3f721131aff17c169addff1de4e55f2152f Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Mon, 7 Nov 2022 18:16:42 +0000 Subject: [PATCH 18/62] aaxtomp3: init at 1.3 Fixes #197312 --- pkgs/applications/audio/aaxtomp3/default.nix | 56 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/audio/aaxtomp3/default.nix diff --git a/pkgs/applications/audio/aaxtomp3/default.nix b/pkgs/applications/audio/aaxtomp3/default.nix new file mode 100644 index 000000000000..358dfce0d4f0 --- /dev/null +++ b/pkgs/applications/audio/aaxtomp3/default.nix @@ -0,0 +1,56 @@ +{ coreutils +, fetchFromGitHub +, ffmpeg +, findutils +, gnugrep +, gnused +, jq +, lame +, lib +, makeWrapper +, mediainfo +, mp4v2 +, stdenv +}: +let + runtimeInputs = [ + coreutils + ffmpeg + findutils + gnugrep + gnused + jq + lame + mediainfo + mp4v2 + ]; +in +stdenv.mkDerivation rec { + pname = "aaxtomp3"; + version = "1.3"; + + src = fetchFromGitHub { + owner = "krumpetpirate"; + repo = pname; + rev = "v${version}"; + hash = "sha256-7a9ZVvobWH/gPxa3cFiPL+vlu8h1Dxtcq0trm3HzlQg="; + }; + + dontBuild = false; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + install -Dm755 AAXtoMP3 $out/bin/aaxtomp3 + wrapProgram $out/bin/aaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} + install -Dm755 interactiveAAXtoMP3 $out/bin/interactiveaaxtomp3 + wrapProgram $out/bin/interactiveaaxtomp3 --prefix PATH : ${lib.makeBinPath runtimeInputs} + ''; + + meta = with lib; { + description = "Convert Audible's .aax filetype to MP3, FLAC, M4A, or OPUS"; + homepage = "https://krumpetpirate.github.io/AAXtoMP3"; + license = licenses.wtfpl; + maintainers = with maintainers; [ urandom ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 51a52a449159..9fd2e699fd6d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27124,6 +27124,8 @@ with pkgs; aacgain = callPackage ../applications/audio/aacgain { }; + aaxtomp3 = callPackage ../applications/audio/aaxtomp3 {}; + abcde = callPackage ../applications/audio/abcde { inherit (python3Packages) eyeD3; }; From 7037d9d527d9fc1c58cc11bff480e099edde8985 Mon Sep 17 00:00:00 2001 From: Colin Arnott Date: Sat, 26 Nov 2022 09:58:36 +0000 Subject: [PATCH 19/62] speedtest-exporter: init at 0.3.2 Fixes #107588 --- .../libraries/speedtest-exporter/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/libraries/speedtest-exporter/default.nix diff --git a/pkgs/development/libraries/speedtest-exporter/default.nix b/pkgs/development/libraries/speedtest-exporter/default.nix new file mode 100644 index 000000000000..51ab1ac33d03 --- /dev/null +++ b/pkgs/development/libraries/speedtest-exporter/default.nix @@ -0,0 +1,26 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "speedtest-exporter"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "nlamirault"; + repo = "speedtest_exporter"; + rev = "v${version}"; + hash = "sha256-WIMDv63sHyZVw3Ct5LFXCIufj7sU2H81n+hT/NiPMeQ="; + }; + + vendorHash = "sha256-Lm73pZzdNZv7J+vKrtQXxm4HiAuB9lugKT/oanmD0HM="; + + meta = with lib; { + description = "Prometheus exporter for Speedtest metrics"; + homepage = "https://github.com/nlamirault/speedtest_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ urandom ]; + mainProgram = "speedtest_exporter"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ddd3f57f82b8..655cc11bc2a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22561,6 +22561,8 @@ with pkgs; speech-tools = callPackage ../development/libraries/speech-tools {}; + speedtest-exporter = callPackage ../development/libraries/speedtest-exporter {}; + speex = callPackage ../development/libraries/speex { fftw = fftwFloat; }; From d97c858d1c2f43a9847a36c9a387d7922afc5421 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Nov 2022 15:52:59 +0300 Subject: [PATCH 20/62] xygrib: 1.2.6.1 -> unstable-2022-05-16 Upstream hasn't had a release since 2019, and this makes it build with Qt 5.15. --- pkgs/applications/misc/xygrib/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 580faa360268..6fedf6751205 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, wrapQtAppsHook, cmake, bzip2, qtbase, qttools, libnova, proj_7, libpng, openjpeg }: stdenv.mkDerivation rec { - version = "1.2.6.1"; + version = "unstable-2022-05-16"; pname = "xygrib"; src = fetchFromGitHub { owner = "opengribs"; repo = "XyGrib"; - rev = "v${version}"; - sha256 = "0xzsm8pr0zjk3f8j880fg5n82jyxn8xf1330qmmq1fqv7rsrg9ia"; + rev = "88c425ca2d7f4ba5d7ab75bfa25e177bee02d310"; + sha256 = "sha256-qMMeRYIQqJpVRE3YjbXIiXHwS/CHs9l2QihszwQIr/A="; }; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ed7f7bd924b5..23692a772349 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33379,7 +33379,7 @@ with pkgs; xnotify = callPackage ../tools/X11/xnotify { }; - xygrib = libsForQt514.callPackage ../applications/misc/xygrib {}; + xygrib = libsForQt5.callPackage ../applications/misc/xygrib { }; xzgv = callPackage ../applications/graphics/xzgv { }; From 14248d3cc126eb2f105ab47796323d4a71f1e66c Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 26 Nov 2022 18:05:04 +0100 Subject: [PATCH 21/62] vscode-extensions.eamodio.gitlens: 12.1.2 -> 2022.11.2204 --- 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 874417216c7d..f122ce596abc 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -874,8 +874,8 @@ let mktplcRef = { name = "gitlens"; publisher = "eamodio"; - version = "12.1.2"; - sha256 = "0wpmfrfpi6wl9v3dknx2qr2m74azpcw8bvhac21v67w6jxnl3jd9"; + version = "2022.11.2204"; + sha256 = "0npr9fymfjnrq7xvfj6fdc04lysz28qncf9r8syv0w9873f3695h"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog"; From 9a921611eb8ee2d20d0d749c04b421034a91c88e Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sat, 26 Nov 2022 18:05:53 +0100 Subject: [PATCH 22/62] vscode-extensions.gruntfuggly.todo-tree: 0.0.215 -> 0.0.220 --- 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 f122ce596abc..b38577691aff 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1322,8 +1322,8 @@ let mktplcRef = { name = "todo-tree"; publisher = "Gruntfuggly"; - version = "0.0.215"; - sha256 = "sha256-WK9J6TvmMCLoqeKWh5FVp1mNAXPWVmRvi/iFuLWMylM="; + version = "0.0.220"; + sha256 = "06kzb4msfdv11lij4dwbn1vxdxhvnpfcjqw0gvydgkqjy7dridjk"; }; meta = with lib; { license = licenses.mit; From b4013acf6c9e780adab9a4447f45a8aee8f32223 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 27 Nov 2022 00:23:22 +0100 Subject: [PATCH 23/62] vscode-extensions.jock.svg: 1.4.19 -> 1.4.23 --- 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 b38577691aff..bef42666a484 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1502,8 +1502,8 @@ let mktplcRef = { name = "svg"; publisher = "jock"; - version = "1.4.19"; - sha256 = "1yl5pxsayplkdqv5jipii7pyj85j2lc4zmibyr69470b6li264rq"; + version = "1.4.23"; + sha256 = "11f1g4a8v8330ki4240bvg5zpydagg1dwqfh1sar9ds7p1795ims"; }; meta = with lib; { license = licenses.mit; From 3888390800ffd1b388fea85140a43bd2731637ab Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 27 Nov 2022 00:25:43 +0100 Subject: [PATCH 24/62] vscode-extensions.johnpapa.vscode-peacock: 4.0.1 -> 4.2.2 --- 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 bef42666a484..7d3dc822b997 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1514,8 +1514,8 @@ let mktplcRef = { name = "vscode-peacock"; publisher = "johnpapa"; - version = "4.0.1"; - sha256 = "sha256-oYXYOamwacgRqv3+ZREJ1vqRlwMz8LpO+wa6CVEEdbI="; + version = "4.2.2"; + sha256 = "1z9crpz025ha9hgc9mxxg3vyrsfpf9d16zm1vrf4q592j9156d2m"; }; meta = with lib; { license = licenses.mit; From 7cfb5f6e7a3b235a70591c87d314cf9b080b16f5 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 27 Nov 2022 00:28:48 +0100 Subject: [PATCH 25/62] vscode-extensions.ms-azuretools.vscode-docker: 1.22.1 -> 1.22.2 --- 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 7d3dc822b997..f005a059aee8 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1812,8 +1812,8 @@ let mktplcRef = { name = "vscode-docker"; publisher = "ms-azuretools"; - version = "1.22.1"; - sha256 = "1ix363fjxi9g450rs3ghx44z3hppvasf0xpzgha93m90djd7ai52"; + version = "1.22.2"; + sha256 = "13scns5iazzsjx8rli311ym2z8i8f4nvbcd5w8hqj5z0rzsds6xi"; }; meta = { license = lib.licenses.mit; From 7781a88a781913580e9120b6564f1f4b220ea600 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 27 Nov 2022 00:31:16 +0100 Subject: [PATCH 26/62] vscode-extensions.ms-vscode.PowerShell: 2022.7.2 -> 2022.11.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index f005a059aee8..ec866ebfdee4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1876,8 +1876,8 @@ let mktplcRef = { name = "PowerShell"; publisher = "ms-vscode"; - version = "2022.7.2"; - sha256 = "sha256-YL90dRmOvfbizT+hfkNu267JtG122LTMS9MHCfaMzkk="; + version = "2022.11.0"; + sha256 = "01pq84rqh2q6rd0ljfql37q6i1kg597qy0mr7fiz5ddi15zcfn19"; }; meta = with lib; { description = "A Visual Studio Code extension for PowerShell language support"; From e8acc24008c7cfef5ea0e95d406ce4790d80f592 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 27 Nov 2022 00:32:06 +0100 Subject: [PATCH 27/62] vscode-extensions.pkief.material-icon-theme: 4.19.0 -> 4.22.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index ec866ebfdee4..3dd19f111fcb 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2173,8 +2173,8 @@ let mktplcRef = { name = "material-icon-theme"; publisher = "PKief"; - version = "4.19.0"; - sha256 = "1azkkp4bnd7n8v0m4325hfrr6p6ikid88xbxaanypji25pnyq5a4"; + version = "4.22.0"; + sha256 = "0irrivfidgjqfd205gh27r2ccj2anvqgvq7lfaaf92wrrc2zvlsk"; }; meta = { license = lib.licenses.mit; From f007d4148ef9bbcc92093b4ee5e196798f397d9f Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Sun, 27 Nov 2022 00:50:39 +0100 Subject: [PATCH 28/62] vscode-extensions.redhat.vscode-yaml: 1.9.1 -> 1.11.10112022 --- 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 3dd19f111fcb..cff8e68ada1f 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2117,8 +2117,8 @@ let mktplcRef = { name = "vscode-yaml"; publisher = "redhat"; - version = "1.9.1"; - sha256 = "10m70sahl7vf8y82gqz9yk6bk4k4b923xn5rk7fax1nqw0pkln2w"; + version = "1.11.10112022"; + sha256 = "0i53n9whcfpds9496r4pa27j3zmd4jc1kpkf4m4rfxzswwngg47x"; }; meta = { license = lib.licenses.mit; From 91e59727c03f37d11ec87f8a76cb07c615d15805 Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Sun, 27 Nov 2022 09:39:27 +0800 Subject: [PATCH 29/62] pari: unbreak on aarch64-darwin --- pkgs/applications/science/math/pari/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 933ad45fd519..0aa167216e8a 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { "--with-gmp=${lib.getDev gmp}" "--with-readline=${lib.getDev readline}" ] - ++ lib.optional stdenv.isDarwin "--host=x86_64-darwin" + ++ lib.optional stdenv.isDarwin "--host=${stdenv.system}" ++ lib.optional withThread "--mt=pthread"; preConfigure = '' @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; postConfigure = lib.optionalString stdenv.isDarwin '' - echo 'echo x86_64-darwin' > config/arch-osname + echo 'echo ${stdenv.system}' > config/arch-osname ''; makeFlags = [ "all" ]; @@ -83,7 +83,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ ertes ] ++ teams.sage.members; platforms = platforms.linux ++ platforms.darwin; - broken = stdenv.isDarwin && stdenv.isAarch64; mainProgram = "gp"; }; } From 10640ed88b72de7b83fbe7c5e5a25ba930cb97d7 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sun, 27 Nov 2022 11:39:20 +0530 Subject: [PATCH 30/62] goawk: 1.20.0 -> 1.21.0 --- pkgs/tools/text/goawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index 435ca0805ab1..c65a05c2a73c 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - sha256 = "sha256-omUtMNB8VBTbihy+VksCduvOENhtPApPBwUIxjVL9fI="; + sha256 = "sha256-I6KmNPFD8kkYDyek8lR1ZS7biPA/LYGwJqMoA2fG7Wg="; }; vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; From 5417b35fdb94b7caf57460acc16892b5fa93d1f8 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 27 Nov 2022 15:10:53 +0800 Subject: [PATCH 31/62] moar: 1.10.0 -> 1.11.0 --- pkgs/tools/misc/moar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index bea127acb008..442b69a471e1 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "moar"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "walles"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cFXUspVSCUy0q5CW8K+YL/LBpK87qlPys8hg6AYvg5M="; + sha256 = "sha256-I/VN2KCI38uADLpLAJbkhTU3AG40ECYVMAqLVajhsw0="; }; vendorSha256 = "sha256-RfkY66879Us0UudplMzW8xEC1zs+2OXwyB+nBim3I0I="; From dbe94c329439f35b7df9a38b77ee232654119604 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Sun, 27 Nov 2022 15:13:07 +0800 Subject: [PATCH 32/62] moar: add ldflags for proper version output --- pkgs/tools/misc/moar/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/misc/moar/default.nix b/pkgs/tools/misc/moar/default.nix index 442b69a471e1..8c7a8ffe3017 100644 --- a/pkgs/tools/misc/moar/default.nix +++ b/pkgs/tools/misc/moar/default.nix @@ -19,6 +19,11 @@ buildGoModule rec { installManPage ./moar.1 ''; + ldflags = [ + "-s" "-w" + "-X" "main.versionString=v${version}" + ]; + meta = with lib; { description = "Nice-to-use pager for humans"; homepage = "https://github.com/walles/moar"; From 5a736d1ee2b03c34c00e55b8dd581a62dc1db759 Mon Sep 17 00:00:00 2001 From: Pol Dellaiera Date: Sun, 27 Nov 2022 09:29:02 +0100 Subject: [PATCH 33/62] php80: 8.0.25 -> 8.0.26 Changelog: https://www.php.net/ChangeLog-8.php#8.0.26 --- pkgs/development/interpreters/php/8.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/8.0.nix b/pkgs/development/interpreters/php/8.0.nix index 3012158a1c6e..3f05a546e23b 100644 --- a/pkgs/development/interpreters/php/8.0.nix +++ b/pkgs/development/interpreters/php/8.0.nix @@ -2,8 +2,8 @@ let base = callPackage ./generic.nix (_args // { - version = "8.0.25"; - hash = "sha256-CdcWvOtbPbdtkCOxDBaB674EDlH0wY39Nfn/i3O7z4w="; + version = "8.0.26"; + hash = "sha256-bfh6+W8nWnWIns5uP+ShOr2Tp2epmShjvcDpDx6Ifuc="; }); in From 75eb0688e8f1b64d73107b4c3e9d767c55f97015 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Nov 2022 11:51:09 +0100 Subject: [PATCH 34/62] isync: Fix SSL error "unexpected eof while reading" This seems to be a regression of the switch to OpenSSL3 and affects at least GMail users: https://sourceforge.net/p/isync/mailman/isync-devel/thread/Y2kZ0YgS2Goayshn%40ugly/#msg37731849 Fix #202595 --- pkgs/tools/networking/isync/default.nix | 3 + ...r-messages-at-end-of-SSL-connections.patch | 76 +++++++++++++++++++ 2 files changed, 79 insertions(+) create mode 100644 pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch diff --git a/pkgs/tools/networking/isync/default.nix b/pkgs/tools/networking/isync/default.nix index 7b04e49da702..d5af78afb66d 100644 --- a/pkgs/tools/networking/isync/default.nix +++ b/pkgs/tools/networking/isync/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { patches = [ # Fixes "Fatal: buffer too small" error ./0001-Increase-imap_vprintf-buffer-size.patch + # Fix #202595: SSL error "Socket error: ... unexpected eof while reading" + # Source: https://sourceforge.net/p/isync/isync/ci/b6c36624f04cd388873785c0631df3f2f9ac4bf0/ + ./work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch ]; nativeBuildInputs = [ pkg-config perl ]; diff --git a/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch b/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch new file mode 100644 index 000000000000..9177085ecad7 --- /dev/null +++ b/pkgs/tools/networking/isync/work-around-unexpected-EOF-error-messages-at-end-of-SSL-connections.patch @@ -0,0 +1,76 @@ +From b6c36624f04cd388873785c0631df3f2f9ac4bf0 Mon Sep 17 00:00:00 2001 +From: Oswald Buddenhagen +Date: Mon, 6 Jun 2022 11:55:37 +0200 +Subject: [PATCH] work around "unexpected EOF" error messages at end of SSL + connections + +gmail apparently doesn't send a close notification (SSL_shutdown()) +before closing the TCP socket. +--- + src/drv_imap.c | 7 +++++-- + src/socket.c | 9 +++++++++ + src/socket.h | 1 + + 3 files changed, 15 insertions(+), 2 deletions(-) + +diff --git a/src/drv_imap.c b/src/drv_imap.c +index fb8d165..6286045 100644 +--- a/src/drv_imap.c ++++ b/src/drv_imap.c +@@ -1620,6 +1620,7 @@ imap_socket_read( void *aux ) + error( "IMAP error: unexpected BYE response: %s\n", cmd ); + /* We just wait for the server to close the connection now. */ + ctx->expectEOF = 1; ++ socket_expect_eof( &ctx->conn ); + } else { + /* We still need to wait for the LOGOUT's tagged OK. */ + } +@@ -1882,10 +1883,12 @@ static void + imap_cleanup_p2( imap_store_t *ctx, + imap_cmd_t *cmd ATTR_UNUSED, int response ) + { +- if (response == RESP_NO) ++ if (response == RESP_NO) { + imap_cancel_store( &ctx->gen ); +- else if (response == RESP_OK) ++ } else if (response == RESP_OK) { + ctx->expectEOF = 1; ++ socket_expect_eof( &ctx->conn ); ++ } + } + + /******************* imap_open_store *******************/ +diff --git a/src/socket.c b/src/socket.c +index ac3c847..892cece 100644 +--- a/src/socket.c ++++ b/src/socket.c +@@ -810,6 +810,15 @@ socket_expect_activity( conn_t *conn, int expect ) + conf_wakeup( &conn->fd_timeout, expect ? conn->conf->timeout : -1 ); + } + ++void ++socket_expect_eof( conn_t *sock ) ++{ ++#ifdef SSL_OP_IGNORE_UNEXPECTED_EOF // implies HAVE_LIBSSL ++ if (sock->ssl) ++ SSL_set_options( sock->ssl, SSL_OP_IGNORE_UNEXPECTED_EOF ); ++#endif ++} ++ + int + socket_read( conn_t *conn, char *buf, uint len ) + { +diff --git a/src/socket.h b/src/socket.h +index 5b1edd0..af679aa 100644 +--- a/src/socket.h ++++ b/src/socket.h +@@ -142,6 +142,7 @@ void socket_start_tls(conn_t *conn, void (*cb)( int ok, void *aux ) ); + void socket_start_deflate( conn_t *conn ); + void socket_close( conn_t *sock ); + void socket_expect_activity( conn_t *sock, int expect ); ++void socket_expect_eof( conn_t *sock ); + int socket_read( conn_t *sock, char *buf, uint len ); /* never waits */ + char *socket_read_line( conn_t *sock ); /* don't free return value; never waits */ + typedef enum { KeepOwn = 0, GiveOwn } ownership_t; +-- +2.38.0 + From 7e30f1beb6069501e6f42fec95fcc6652d272555 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 11:19:47 +0000 Subject: [PATCH 35/62] tut: 1.0.19 -> 1.0.22 --- pkgs/applications/misc/tut/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/tut/default.nix b/pkgs/applications/misc/tut/default.nix index 51b21a31cf2e..a47c509c4311 100644 --- a/pkgs/applications/misc/tut/default.nix +++ b/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "1.0.19"; + version = "1.0.22"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-lT/3KXxrZYOK/oGrlorQUIv8J7tAfME0hRb1bwN+nXA="; + sha256 = "sha256-wFK5dFGD25KtBn4gujgvDu8zZWQ8XH1peEbpLa+6n8A="; }; - vendorSha256 = "sha256-O7tre7eSGlB9mnf/9aNbe/Ji0ecmJyuLuaWKARskCjI="; + vendorSha256 = "sha256-HZrchLQ1861MYWDiiegXLNMDsDUzRNzLA7MoULBai+4="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; From 5d6f4545ffa3f22ef69f822f2e6fd326129913fe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 12:12:17 +0000 Subject: [PATCH 36/62] vendir: 0.32.0 -> 0.32.1 --- pkgs/development/tools/vendir/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/vendir/default.nix b/pkgs/development/tools/vendir/default.nix index 13c8ff8d0df1..23c3b4a5c098 100644 --- a/pkgs/development/tools/vendir/default.nix +++ b/pkgs/development/tools/vendir/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vendir"; - version = "0.32.0"; + version = "0.32.1"; src = fetchFromGitHub { owner = "vmware-tanzu"; repo = "carvel-vendir"; rev = "v${version}"; - sha256 = "sha256-VuOf+8PgscoHNVPO8gDoFGGPSBxO5BNLpmUJnYL898s="; + sha256 = "sha256-IgPUqIR9xuLEglVqVHz2KvqqCHpCPYv8TX+Z6q5xCNA="; }; vendorSha256 = null; From 8bed9cc42f2c11be6a106b6c5b031d00ea61622a Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 27 Nov 2022 12:46:45 +0000 Subject: [PATCH 37/62] streamlit: 1.13.0 -> 1.15.0 --- .../machine-learning/streamlit/default.nix | 62 +++++++++---------- pkgs/top-level/python-packages.nix | 6 ++ 2 files changed, 37 insertions(+), 31 deletions(-) diff --git a/pkgs/applications/science/machine-learning/streamlit/default.nix b/pkgs/applications/science/machine-learning/streamlit/default.nix index 03db1cf3cf85..90830ae9ffca 100755 --- a/pkgs/applications/science/machine-learning/streamlit/default.nix +++ b/pkgs/applications/science/machine-learning/streamlit/default.nix @@ -1,41 +1,41 @@ { # Nix - lib, - buildPythonApplication, - fetchPypi, - - # Build inputs - altair, - blinker, - click, - cachetools, - GitPython, - importlib-metadata, - jinja2, - pillow, - pyarrow, - pydeck, - pympler, - protobuf, - requests, - rich, - semver, - setuptools, - toml, - tornado, - tzlocal, - validators, - watchdog, + lib +, buildPythonApplication +, fetchPypi +, # Build inputs + altair +, blinker +, click +, cachetools +, GitPython +, importlib-metadata +, jinja2 +, pillow +, pyarrow +, pydeck +, pympler +, protobuf3 +, requests +, rich +, semver +, setuptools +, toml +, tornado +, tzlocal +, validators +, watchdog +, }: buildPythonApplication rec { pname = "streamlit"; - version = "1.13.0"; - format = "wheel"; # source currently requires pipenv + version = "1.15.0"; + format = "wheel"; # source currently requires pipenv src = fetchPypi { inherit pname version format; - hash = "sha256-MjGm9CT4p/Nl3J5G1Pu2ajY0/VcMdHabimn3ktkoXTo="; + hash = "sha256-QtBr3INWBwCBab+FzmvzrjGjwVVHC8NCET9wtRVeVbc="; }; propagatedBuildInputs = [ @@ -47,7 +47,7 @@ buildPythonApplication rec { importlib-metadata jinja2 pillow - protobuf + protobuf3 pyarrow pydeck pympler @@ -63,7 +63,7 @@ buildPythonApplication rec { ]; postInstall = '' - rm $out/bin/streamlit.cmd # remove windows helper + rm $out/bin/streamlit.cmd # remove windows helper ''; meta = with lib; { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8e25b0335c61..7dbe4242bb54 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7354,11 +7354,17 @@ self: super: with self; { proto-plus = callPackage ../development/python-modules/proto-plus { }; + # Protobuf 4.x protobuf = callPackage ../development/python-modules/protobuf { # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. inherit (pkgs) protobuf; }; + # Protobuf 3.x + protobuf3 = callPackage ../development/python-modules/protobuf { + protobuf = pkgs.protobuf3_20; + }; + protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; proton-client = callPackage ../development/python-modules/proton-client { }; From 463942ec3519e9bf24d35549a1b76de99e466999 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 14:27:16 +0000 Subject: [PATCH 38/62] webanalyze: 0.3.7 -> 0.3.8 --- pkgs/tools/security/webanalyze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix index 1cbc22b1482d..65197cff4ca5 100644 --- a/pkgs/tools/security/webanalyze/default.nix +++ b/pkgs/tools/security/webanalyze/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "webanalyze"; - version = "0.3.7"; + version = "0.3.8"; src = fetchFromGitHub { owner = "rverton"; repo = pname; rev = "v${version}"; - hash = "sha256-W7NgV50r/MNSF6+e0IR9C1dcg/k0w67GcTs0NTbhKBc="; + hash = "sha256-1z4hi9a/OzBXIMBk1f0JpPMV/kRgBnTQAEygIZqV+1w="; }; vendorSha256 = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0="; From 2d66b81a1c181adf7eb177b84ba7dbbd19195e76 Mon Sep 17 00:00:00 2001 From: Albert Safin Date: Sun, 27 Nov 2022 14:38:15 +0000 Subject: [PATCH 39/62] wapm: fix build --- pkgs/tools/package-management/wapm/cli/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/package-management/wapm/cli/default.nix b/pkgs/tools/package-management/wapm/cli/default.nix index b71bb166ea8b..fcb206b1a752 100644 --- a/pkgs/tools/package-management/wapm/cli/default.nix +++ b/pkgs/tools/package-management/wapm/cli/default.nix @@ -1,5 +1,6 @@ { lib , fetchFromGitHub +, perl , libiconv , openssl , rustPlatform @@ -21,6 +22,8 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-dv04AXOnzizjq/qx3qy524ylQHgE4gIBgeYI+2IRTug="; + nativeBuildInputs = [ perl ]; + buildInputs = [ libiconv openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; From 11c3789b0be197f38f742bc41bba5758a689973c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Reynier?= Date: Sun, 27 Nov 2022 15:54:04 +0100 Subject: [PATCH 40/62] nodePackages.coc-ltex: add to vim plugins --- pkgs/applications/editors/vim/plugins/overrides.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index e294ea0b5a2b..06b4e615e987 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -1124,6 +1124,7 @@ self: super: { "coc-jest" "coc-json" "coc-lists" + "coc-ltex" "coc-markdownlint" "coc-metals" "coc-pairs" From 19b3fa0a68fc32fb7387c02142147eb351f17484 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?PedroHLC=20=E2=98=AD?= Date: Sun, 27 Nov 2022 11:59:15 -0300 Subject: [PATCH 41/62] swaylock: 1.6 -> 1.7 --- pkgs/applications/window-managers/sway/lock.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index 970fdfe371fe..30e43fa0c902 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -5,24 +5,15 @@ stdenv.mkDerivation rec { pname = "swaylock"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "swaywm"; repo = "swaylock"; rev = version; - sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; + hash = "sha256-xbcVsnE0DecC+g49NOBNpqPl5JTtuxUUc7KinKhi5TE="; }; - patches = [ - # remove once when updating to 1.7 - # https://github.com/swaywm/swaylock/pull/235 - (fetchpatch { - url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff"; - sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ="; - }) - ]; - strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; From 5feb4e39442afe8dfcd846c22761ba84f9284215 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 27 Nov 2022 16:10:14 +0100 Subject: [PATCH 42/62] webanalyze: add changelog to meta --- pkgs/tools/security/webanalyze/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/webanalyze/default.nix b/pkgs/tools/security/webanalyze/default.nix index 65197cff4ca5..cfce48228b57 100644 --- a/pkgs/tools/security/webanalyze/default.nix +++ b/pkgs/tools/security/webanalyze/default.nix @@ -10,15 +10,16 @@ buildGoModule rec { src = fetchFromGitHub { owner = "rverton"; repo = pname; - rev = "v${version}"; + rev = "refs/tags/v${version}"; hash = "sha256-1z4hi9a/OzBXIMBk1f0JpPMV/kRgBnTQAEygIZqV+1w="; }; - vendorSha256 = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0="; + vendorHash = "sha256-kXtWYGsZUUhBNvkTOah3Z+ta118k6PXfpBx6MLr/pq0="; meta = with lib; { description = "Tool to uncover technologies used on websites"; homepage = "https://github.com/rverton/webanalyze"; + changelog = "https://github.com/rverton/webanalyze/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ fab ]; }; From 841eb671f7e0d4a01120af4e77b4729aec9e96c5 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 27 Nov 2022 11:00:16 -0500 Subject: [PATCH 43/62] cargo-hack: 0.5.22 -> 0.5.23 Changelog: https://github.com/taiki-e/cargo-hack/blob/v0.5.23/CHANGELOG.md --- pkgs/development/tools/rust/cargo-hack/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-hack/default.nix b/pkgs/development/tools/rust/cargo-hack/default.nix index fc34656edcd8..737373ff628a 100644 --- a/pkgs/development/tools/rust/cargo-hack/default.nix +++ b/pkgs/development/tools/rust/cargo-hack/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-hack"; - version = "0.5.22"; + version = "0.5.23"; src = fetchCrate { inherit pname version; - sha256 = "sha256-TuHCKitlCCV//VBi514IMdcscsBc4yibfdsCO/nmisU="; + sha256 = "sha256-5iFc8wEejCuD8HbaJv2XuZ/LP7aPtGJk+gXTJqAr8aM="; }; - cargoSha256 = "sha256-2tF6553SGbBrGkTznk3zWMweQjks+Z699HE1l0DVYec="; + cargoSha256 = "sha256-U6F/5VeALxs8YysU4VOLBUCu8d0Iaf3VRE7g2zRTAkg="; # some necessary files are absent in the crate version doCheck = false; From e4a3681a21cc3195a92bceb7fe81ad9f5cc6fdc2 Mon Sep 17 00:00:00 2001 From: def Date: Sun, 27 Nov 2022 19:46:53 +0400 Subject: [PATCH 44/62] pyTelegramBotAPI: fix build --- pkgs/development/python-modules/pyTelegramBotAPI/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 5fb31f9fdde2..03ed9fc5884d 100644 --- a/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -3,6 +3,7 @@ , fetchPypi , aiohttp , requests +, fastapi , pythonOlder }: @@ -21,6 +22,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ aiohttp requests + fastapi ]; pythonImportsCheck = [ From fa7fb1afe99a9432eaaffe04cde3a09716bb7f5e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sun, 27 Nov 2022 17:54:37 +0100 Subject: [PATCH 45/62] commonsBcel: 5.2 -> 6.6.1 Fixes CVE-2022-42920. https://www.apache.org/dist/commons/bcel/RELEASE-NOTES.txt --- pkgs/development/libraries/java/commons/bcel/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/java/commons/bcel/default.nix b/pkgs/development/libraries/java/commons/bcel/default.nix index 0a121d923146..053d06f34a6e 100644 --- a/pkgs/development/libraries/java/commons/bcel/default.nix +++ b/pkgs/development/libraries/java/commons/bcel/default.nix @@ -1,18 +1,18 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "5.2"; + version = "6.6.1"; pname = "commons-bcel"; src = fetchurl { - url = "mirror://apache/commons/bcel/binaries/bcel-${version}.tar.gz"; - sha256 = "13ppnd6afljdjq21jpn4ik2h1yxq8k2kg21ghi0lyb1yap1rd7k6"; + url = "mirror://apache/commons/bcel/binaries/bcel-${version}-bin.tar.gz"; + sha256 = "sha256-bwbERZqnmXD2LzGilDZYsr7BPQoTeZDwDU/8/AjAdP4="; }; installPhase = '' tar xf ${src} mkdir -p $out/share/java - cp bcel-5.2.jar $out/share/java/ + cp bcel-${version}.jar $out/share/java/ ''; meta = { From ec045d118ac4997d537892155d48ceaefe690d01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 27 Nov 2022 18:00:41 +0100 Subject: [PATCH 46/62] patchelf_0_14: rename to patchelfStable It was 0.15.x already, and r-ryantm keeps suggesting updates. --- pkgs/top-level/all-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 39e432804015..ab072e03a2d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17534,11 +17534,11 @@ with pkgs; patchelf = if with stdenv.buildPlatform; isAarch64 && isMusl then patchelf_0_13 else - patchelf_0_14; + patchelfStable; patchelf_0_13 = callPackage ../development/tools/misc/patchelf/0.13.nix { - patchelf = patchelf_0_14; + patchelf = patchelfStable; }; - patchelf_0_14 = callPackage ../development/tools/misc/patchelf { }; + patchelfStable = callPackage ../development/tools/misc/patchelf { }; patchelfUnstable = lowPrio (callPackage ../development/tools/misc/patchelf/unstable.nix { }); From b41229b19de125f989d4837a6e1df7a72b0465f8 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 24 Nov 2022 22:31:36 +0100 Subject: [PATCH 47/62] gringo: remove at 4.5.4 The gringo binary is part of the clingo package --- pkgs/tools/misc/aspcud/default.nix | 6 +- pkgs/tools/misc/gringo/default.nix | 57 ------------------- .../misc/gringo/gringo-4.5.4-cmath.patch | 11 ---- .../misc/gringo/gringo-4.5.4-to_string.patch | 11 ---- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 - 6 files changed, 4 insertions(+), 84 deletions(-) delete mode 100644 pkgs/tools/misc/gringo/default.nix delete mode 100644 pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch delete mode 100644 pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch diff --git a/pkgs/tools/misc/aspcud/default.nix b/pkgs/tools/misc/aspcud/default.nix index 690e69b80642..057ba28ff061 100644 --- a/pkgs/tools/misc/aspcud/default.nix +++ b/pkgs/tools/misc/aspcud/default.nix @@ -5,7 +5,7 @@ , catch2 , clasp , cmake -, gringo +, clingo , re2c }: @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost clasp gringo re2c ]; + buildInputs = [ boost clasp clingo re2c ]; cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" - "-DASPCUD_GRINGO_PATH=${gringo}/bin/gringo" + "-DASPCUD_GRINGO_PATH=${clingo}/bin/gringo" "-DASPCUD_CLASP_PATH=${clasp}/bin/clasp" ]; diff --git a/pkgs/tools/misc/gringo/default.nix b/pkgs/tools/misc/gringo/default.nix deleted file mode 100644 index cbaa96110722..000000000000 --- a/pkgs/tools/misc/gringo/default.nix +++ /dev/null @@ -1,57 +0,0 @@ -{ lib, stdenv, fetchurl, - bison, re2c, sconsPackages, - libcxx, libcxxabi -}: - -stdenv.mkDerivation rec { - pname = "gringo"; - version = "4.5.4"; - - src = fetchurl { - url = "mirror://sourceforge/project/potassco/gringo/${version}/gringo-${version}-source.tar.gz"; - sha256 = "16k4pkwyr2mh5w8j91vhxh9aff7f4y31npwf09w6f8q63fxvpy41"; - }; - - buildInputs = [ bison re2c sconsPackages.scons_3_1_2 ]; - - patches = [ - ./gringo-4.5.4-cmath.patch - ./gringo-4.5.4-to_string.patch - ]; - - postPatch = lib.optionalString stdenv.isDarwin '' - substituteInPlace ./SConstruct \ - --replace \ - "env['CXX'] = 'g++'" \ - "env['CXX'] = '$CXX'" - - substituteInPlace ./SConstruct \ - --replace \ - "env['CPPPATH'] = []" \ - "env['CPPPATH'] = ['${lib.getDev libcxx}/include/c++/v1']" - - substituteInPlace ./SConstruct \ - --replace \ - "env['LIBPATH'] = []" \ - "env['LIBPATH'] = ['${lib.getLib libcxx}/lib', '${lib.getLib libcxxabi}/lib']" - '' + '' - sed '1i#include ' -i libgringo/gringo/{control,term}.hh - ''; - - buildPhase = '' - scons WITH_PYTHON= --build-dir=release - ''; - - installPhase = '' - mkdir -p $out/bin - cp build/release/gringo $out/bin/gringo - ''; - - meta = with lib; { - description = "Converts input programs with first-order variables to equivalent ground programs"; - homepage = "http://potassco.sourceforge.net/"; - platforms = platforms.all; - maintainers = [ maintainers.hakuch ]; - license = licenses.gpl3Plus; - }; -} diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch deleted file mode 100644 index 7b5510e2344b..000000000000 --- a/pkgs/tools/misc/gringo/gringo-4.5.4-cmath.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gringo/libgringo/src/term.cc~ 2016-07-12 23:56:10.593577749 -0400 -+++ gringo/libgringo/src/term.cc 2016-07-12 23:52:35.169968338 -0400 -@@ -22,6 +22,8 @@ - #include "gringo/logger.hh" - #include "gringo/graph.hh" - -+#include -+ - namespace Gringo { - - // {{{ definition of Defines diff --git a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch b/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch deleted file mode 100644 index b81eab4cd678..000000000000 --- a/pkgs/tools/misc/gringo/gringo-4.5.4-to_string.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- gringo/libgringo/gringo/bug.hh~ 2014-03-10 12:19:26.000000000 -0400 -+++ gringo/libgringo/gringo/bug.hh 2016-11-12 07:51:55.288563663 -0500 -@@ -32,7 +32,7 @@ - #define _GLIBCXX_MAKE_MOVE_ITERATOR(_Iter) std::make_move_iterator(_Iter) - #define _GLIBCXX_MAKE_MOVE_IF_NOEXCEPT_ITERATOR(_Iter) std::make_move_iterator(_Iter) - --#ifdef MISSING_STD_TO_STRING -+#if 0 - - #include - diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 2367481482e4..8043bfd33cbc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -584,6 +584,7 @@ mapAliases ({ grantlee5 = throw "'grantlee5' has been renamed to/replaced by 'libsForQt5.grantlee'"; # Converted to throw 2022-02-22 gr-gsm = gnuradio3_7.pkgs.gsm; # Added 2019-05-27, changed 2020-10-16 grib-api = throw "grib-api has been replaced by ecCodes => https://confluence.ecmwf.int/display/ECC/GRIB-API+migration"; # Added 2022-01-05 + gringo = clingo; # added 2022-11-27 gr-limesdr = gnuradio3_7.pkgs.limesdr; # Added 2019-05-27, changed 2020-10-16 gr-nacl = gnuradio3_7.pkgs.nacl; # Added 2019-05-27, changed 2020-10-16 gr-osmosdr = gnuradio3_7.pkgs.osmosdr; # Added 2019-05-27, changed 2020-10-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ba6ca94e1f4..c3eeb5d95608 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4281,8 +4281,6 @@ with pkgs; grim = callPackage ../tools/graphics/grim { }; - gringo = callPackage ../tools/misc/gringo { }; - grit = callPackage ../tools/misc/grit { }; grobi = callPackage ../tools/X11/grobi { }; From 1106312d84546ba65e3c51fdca79cd0cc97ff46a Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 27 Nov 2022 19:10:33 +0100 Subject: [PATCH 48/62] pkgsMusl.gjs: fix build (#203248) --- pkgs/development/libraries/gjs/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/gjs/default.nix b/pkgs/development/libraries/gjs/default.nix index 540fe842c5a7..8b15bbf608d5 100644 --- a/pkgs/development/libraries/gjs/default.nix +++ b/pkgs/development/libraries/gjs/default.nix @@ -79,7 +79,7 @@ in stdenv.mkDerivation rec { mesonFlags = [ "-Dinstalled_test_prefix=${placeholder "installedTests"}" - ] ++ lib.optionals (!stdenv.isLinux) [ + ] ++ lib.optionals (!stdenv.isLinux || stdenv.hostPlatform.isMusl) [ "-Dprofiler=disabled" ]; @@ -88,6 +88,9 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs build/choose-tests-locale.sh substituteInPlace installed-tests/debugger-test.sh --subst-var-by gjsConsole $out/bin/gjs-console + '' + lib.optionalString stdenv.hostPlatform.isMusl '' + substituteInPlace installed-tests/js/meson.build \ + --replace "'Encoding'," "#'Encoding'," ''; preCheck = '' From 9d05d42f4d61f28207eef3492115168739cdc442 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 27 Nov 2022 18:52:22 +0100 Subject: [PATCH 49/62] chromiumBeta: Fix the configuration phase Upstream switched use_system_libwayland to false [0] and system_wayland_scanner_path will now only be declared if use_system_wayland_scanner is set to true (it defaults to use_system_libwayland) [1]. In Nixpkgs, we usually try to set use_system_* to true (i.e., we favor system libraries over bundled/vendored ones) but in the case of Chromium this can become difficult to maintain so we might eventually drop `use_system_libwayland = true` again (IIRC this only caused one incompatibility in the past though: b6b51374fc7; and f9d9864cb62 will become relevant again when we build with the bundled libwayland). [0]: https://source.chromium.org/chromium/chromium/src/+/b33bdfe2654df61dee900e7b85cc3fcaea6b65a3 [1]: https://source.chromium.org/chromium/chromium/src/+/272220cefa2cff8cf9273a02155454650e79e024 --- pkgs/applications/networking/browsers/chromium/common.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 39a2f3d18369..523a9b251809 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -295,7 +295,14 @@ let chrome_pgo_phase = 0; clang_base_path = "${llvmPackages.clang}"; use_qt = false; + } // optionalAttrs (!chromiumVersionAtLeast "108") { use_system_libwayland_server = true; + } // optionalAttrs (chromiumVersionAtLeast "108") { + # The default has changed to false. We'll build with libwayland from + # Nixpkgs for now but might want to eventually use the bundled libwayland + # as well to avoid incompatibilities (if this continues to be a problem + # from time to time): + use_system_libwayland = true; } // optionalAttrs proprietaryCodecs { # enable support for the H.264 codec proprietary_codecs = true; From 6ff09ebe045ba5c048fa30ed1aa42c928dacb11f Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 27 Nov 2022 19:11:44 +0100 Subject: [PATCH 50/62] pkgsMusl.nfs-utils: fix build (#203275) This patch does not apply and is no longer needed. alpine removed it here: https://git.alpinelinux.org/aports/commit/main/nfs-utils?id=165dd080660bea8a4cefb71b68fc1110732f8006 --- pkgs/os-specific/linux/nfs-utils/default.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/pkgs/os-specific/linux/nfs-utils/default.nix b/pkgs/os-specific/linux/nfs-utils/default.nix index acb325a6e09f..4fde1dcf910d 100644 --- a/pkgs/os-specific/linux/nfs-utils/default.nix +++ b/pkgs/os-specific/linux/nfs-utils/default.nix @@ -50,10 +50,6 @@ stdenv.mkDerivation rec { ]; patches = lib.optionals stdenv.hostPlatform.isMusl [ - (fetchpatch { - url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/0011-exportfs-only-do-glibc-specific-hackery-on-glibc.patch"; - sha256 = "0rrddrykz8prk0dcgfvmnz0vxn09dbgq8cb098yjjg19zz6d7vid"; - }) # http://openwall.com/lists/musl/2015/08/18/10 (fetchpatch { url = "https://raw.githubusercontent.com/alpinelinux/aports/cb880042d48d77af412d4688f24b8310ae44f55f/main/nfs-utils/musl-getservbyport.patch"; From 2e55337c2671af35e035339248cbee92f00a0a92 Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 27 Nov 2022 19:23:57 +0100 Subject: [PATCH 51/62] pkgsMusl.libcdio: fix build (#203252) --- pkgs/development/libraries/libcdio/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libcdio/default.nix b/pkgs/development/libraries/libcdio/default.nix index 546573c62306..324f0669af31 100644 --- a/pkgs/development/libraries/libcdio/default.nix +++ b/pkgs/development/libraries/libcdio/default.nix @@ -17,6 +17,13 @@ stdenv.mkDerivation rec { url = "https://savannah.gnu.org/patch/download.php?file_id=52179"; sha256 = "1v15gxhpi4bgcr12pb3d9c3hiwj0drvc832vic7sham34lhjmcbb"; }) + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + (fetchpatch { + name = "musl-realpath-test.patch"; + url = "https://git.alpinelinux.org/aports/plain/community/libcdio/disable-broken-test.patch?id=058a8695c12ae13b40c981ee98809352490b6155"; + includes = [ "test/driver/realpath.c" ]; + sha256 = "sha256-6j2bjMed2l+TFZ5emjCcozzF/kkGA8FVifJB8U7QceU="; + }) ]; postPatch = '' From 081d01470d6252296f078c2d98bcc37f8152eb7e Mon Sep 17 00:00:00 2001 From: Yureka Date: Sun, 27 Nov 2022 19:24:11 +0100 Subject: [PATCH 52/62] pkgsMusl.spice-gtk: fix build (#203254) --- pkgs/development/libraries/spice-gtk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/spice-gtk/default.nix b/pkgs/development/libraries/spice-gtk/default.nix index 2564162c3bf1..cb5065144c37 100644 --- a/pkgs/development/libraries/spice-gtk/default.nix +++ b/pkgs/development/libraries/spice-gtk/default.nix @@ -137,6 +137,8 @@ stdenv.mkDerivation rec { "-Dpolkit=disabled" ] ++ lib.optionals (!stdenv.isLinux) [ "-Dlibcap-ng=disabled" + ] ++ lib.optionals stdenv.hostPlatform.isMusl [ + "-Dcoroutine=gthread" # Fixes "Function missing:makecontext" ]; meta = with lib; { From 1be86c6823806d14c8aadbd3cdaf64ac2eef0f6b Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Nov 2022 16:15:36 +0300 Subject: [PATCH 53/62] cb2bib: wrap correctly --- pkgs/applications/office/cb2bib/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/cb2bib/default.nix b/pkgs/applications/office/cb2bib/default.nix index b0a0fded80ae..331e6a7c3a26 100644 --- a/pkgs/applications/office/cb2bib/default.nix +++ b/pkgs/applications/office/cb2bib/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11 }: +{ lib, stdenv, fetchurl, qmake, qtbase, qtwebkit, qtx11extras, lzo, libX11, wrapQtAppsHook }: stdenv.mkDerivation rec { pname = "cb2bib"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0gv7cnxi84lr6d5y71pd67h0ilmf5c88j1jxgyn9dvj19smrv99h"; }; buildInputs = [ qtbase qtwebkit qtx11extras lzo libX11 ]; - nativeBuildInputs = [ qmake ]; + nativeBuildInputs = [ qmake wrapQtAppsHook ]; configurePhase = '' runHook preConfigure @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { runHook postConfigure ''; - dontWrapQtApps = true; - meta = with lib; { description = "Rapidly extract unformatted, or unstandardized bibliographic references from email alerts, journal Web pages and PDF files"; homepage = "http://www.molspaces.com/d_cb2bib-overview.php"; From 0ca0937e42c3cf19eb7e0883391c98e60191e028 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 26 Nov 2022 16:19:26 +0300 Subject: [PATCH 54/62] treewide: move things that build and run with Qt 5.15 to Qt 5.15 --- pkgs/top-level/all-packages.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ab072e03a2d3..e301541b2bc7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -608,8 +608,7 @@ with pkgs; archiver = callPackage ../applications/misc/archiver { }; - # It segfaults if it uses qt5.15 - digitalbitbox = libsForQt514.callPackage ../applications/misc/digitalbitbox { + digitalbitbox = libsForQt5.callPackage ../applications/misc/digitalbitbox { autoreconfHook = buildPackages.autoreconfHook269; }; @@ -2290,7 +2289,7 @@ with pkgs; brakeman = callPackage ../development/tools/analysis/brakeman { }; - brewtarget = libsForQt514.callPackage ../applications/misc/brewtarget { } ; + brewtarget = libsForQt5.callPackage ../applications/misc/brewtarget { } ; # Derivation's result is not used by nixpkgs. Useful for validation for # regressions of bootstrapTools on hydra and on ofborg. Example: @@ -11083,7 +11082,7 @@ with pkgs; rockbox-utility = libsForQt5.callPackage ../tools/misc/rockbox-utility { }; - rosegarden = libsForQt514.callPackage ../applications/audio/rosegarden { }; + rosegarden = libsForQt5.callPackage ../applications/audio/rosegarden { }; rowhammer-test = callPackage ../tools/system/rowhammer-test { }; @@ -12975,7 +12974,7 @@ with pkgs; wireguard-go = callPackage ../tools/networking/wireguard-go { }; - wkhtmltopdf = libsForQt514.callPackage ../tools/graphics/wkhtmltopdf { }; + wkhtmltopdf = libsForQt5.callPackage ../tools/graphics/wkhtmltopdf { }; wkhtmltopdf-bin = callPackage ../tools/graphics/wkhtmltopdf-bin { libjpeg8 = libjpeg.override { enableJpeg8 = true; }; @@ -27710,7 +27709,7 @@ with pkgs; cava = callPackage ../applications/audio/cava { }; - cb2bib = libsForQt514.callPackage ../applications/office/cb2bib { }; + cb2bib = libsForQt5.callPackage ../applications/office/cb2bib { }; cbatticon = callPackage ../applications/misc/cbatticon { }; @@ -29681,7 +29680,7 @@ with pkgs; lua = lua5_1; }; - ipe = libsForQt514.callPackage ../applications/graphics/ipe { + ipe = libsForQt5.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; @@ -36357,7 +36356,7 @@ with pkgs; ### SCIENCE/ROBOTICS - apmplanner2 = libsForQt514.callPackage ../applications/science/robotics/apmplanner2 { }; + apmplanner2 = libsForQt5.callPackage ../applications/science/robotics/apmplanner2 { }; betaflight-configurator = callPackage ../applications/science/robotics/betaflight-configurator { }; From ceee02670c41f466c3a76816b256e8483b0cc3dd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 27 Nov 2022 16:27:17 +0000 Subject: [PATCH 55/62] python310Packages.mastodon-py: 1.6.3 -> 1.7.0 --- pkgs/development/python-modules/mastodon-py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mastodon-py/default.nix b/pkgs/development/python-modules/mastodon-py/default.nix index ada014a6b81d..e0d7928e54b2 100644 --- a/pkgs/development/python-modules/mastodon-py/default.nix +++ b/pkgs/development/python-modules/mastodon-py/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "mastodon-py"; - version = "1.6.3"; + version = "1.7.0"; src = fetchFromGitHub { owner = "halcy"; repo = "Mastodon.py"; rev = "refs/tags/${version}"; - sha256 = "sha256-bzacM5bJa936sBW+hgm9GOezW8cVY2oPaWApqjDYLSo="; + sha256 = "sha256-QavgCWWiGmGnNoEX7pxzUyujEQObXhkaucv4FduZ/Vg="; }; postPatch = '' From 8e257195bea1ab354f942b7c465b77d6176a1415 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 27 Nov 2022 21:14:36 +0100 Subject: [PATCH 56/62] xygrib: remove myself from maintainers --- pkgs/applications/misc/xygrib/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/xygrib/default.nix b/pkgs/applications/misc/xygrib/default.nix index 580faa360268..b6dd811db06f 100644 --- a/pkgs/applications/misc/xygrib/default.nix +++ b/pkgs/applications/misc/xygrib/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; platforms = platforms.all; - maintainers = with maintainers; [ j03 SuperSandro2000 ]; + maintainers = with maintainers; [ j03 ]; }; } From 4884ac130816156095e69544257701fc620d4b36 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 17 May 2022 20:24:54 +0000 Subject: [PATCH 57/62] esptool: 3.3.1 -> 4.4 --- pkgs/tools/misc/esptool/default.nix | 30 +++---- .../misc/esptool/test-call-bin-directly.patch | 89 +++++++++++++++++++ 2 files changed, 100 insertions(+), 19 deletions(-) create mode 100644 pkgs/tools/misc/esptool/test-call-bin-directly.patch diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index e48e02694052..609c5d74c79e 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -1,20 +1,22 @@ -{ lib, fetchFromGitHub, python3, openssl }: +{ lib +, fetchFromGitHub +, python3 +}: python3.pkgs.buildPythonApplication rec { pname = "esptool"; - version = "3.3.1"; + version = "4.4"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - hash = "sha256-9WmiLji7Zoad5WIzgkpvkI9t96sfdkCtFh6zqVxF7qo="; + hash = "sha256-haLwf3loOvqdqQN/iuVBciQ6nCnuc9AqqOGKvDwLBHE="; }; - postPatch = '' - substituteInPlace test/test_imagegen.py \ - --replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY" - ''; + patches = [ + ./test-call-bin-directly.patch + ]; propagatedBuildInputs = with python3.pkgs; [ bitstring @@ -24,26 +26,16 @@ python3.pkgs.buildPythonApplication rec { reedsolo ]; - # wrapPythonPrograms will overwrite esptool.py with a bash script, - # but espefuse.py tries to import it. Since we don't add any binary paths, - # use patchPythonScript directly. - dontWrapPythonPrograms = true; - postFixup = '' - buildPythonPath "$out $pythonPath" - for f in $out/bin/*.py; do - echo "Patching $f" - patchPythonScript "$f" - done - ''; - checkInputs = with python3.pkgs; [ pyelftools + pytest ]; # tests mentioned in `.github/workflows/test_esptool.yml` checkPhase = '' runHook preCheck + export ESPSECURE_PY=$out/bin/espsecure.py export ESPTOOL_PY=$out/bin/esptool.py ${python3.interpreter} test/test_imagegen.py ${python3.interpreter} test/test_espsecure.py diff --git a/pkgs/tools/misc/esptool/test-call-bin-directly.patch b/pkgs/tools/misc/esptool/test-call-bin-directly.patch new file mode 100644 index 000000000000..b7d772780090 --- /dev/null +++ b/pkgs/tools/misc/esptool/test-call-bin-directly.patch @@ -0,0 +1,89 @@ +diff --git a/test/test_espsecure.py b/test/test_espsecure.py +index 25b0b87..627005c 100755 +--- a/test/test_espsecure.py ++++ b/test/test_espsecure.py +@@ -35,7 +35,7 @@ class EspSecureTestCase: + Returns output as a string if there is any, + raises an exception if espsecure.py fails + """ +- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ") ++ cmd = [ESPSECURE_PY] + args.split(" ") + print("\nExecuting {}...".format(" ".join(cmd))) + + try: +diff --git a/test/test_esptool.py b/test/test_esptool.py +index 042a1ce..b294e26 100755 +--- a/test/test_esptool.py ++++ b/test/test_esptool.py +@@ -57,7 +57,10 @@ try: + ESPTOOL_PY = os.environ["ESPTOOL_PY"] + except KeyError: + ESPTOOL_PY = os.path.join(TEST_DIR, "..", "esptool/__init__.py") +-ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py") ++try: ++ ESPSECURE_PY = os.environ["ESPSECURE_PY"] ++except KeyError: ++ ESPSECURE_PY = os.path.join(TEST_DIR, "..", "espsecure/__init__.py") + ESPRFC2217SERVER_PY = os.path.join(TEST_DIR, "..", "esp_rfc2217_server.py") + + RETURN_CODE_FATAL_ERROR = 2 +@@ -74,7 +77,6 @@ class ESPRFC2217Server(object): + def __init__(self, rfc2217_port=None): + self.port = rfc2217_port or self.get_free_port() + self.cmd = [ +- sys.executable, + ESPRFC2217SERVER_PY, + "-p", + str(self.port), +@@ -130,7 +132,7 @@ class ESPRFC2217Server(object): + class EsptoolTestCase: + def run_espsecure(self, args): + +- cmd = [sys.executable, ESPSECURE_PY] + args.split(" ") ++ cmd = [ESPSECURE_PY] + args.split(" ") + print("\nExecuting {}...".format(" ".join(cmd))) + try: + output = subprocess.check_output( +@@ -155,7 +157,7 @@ class EsptoolTestCase: + Raises an exception if esptool.py fails. + """ + trace_args = ["--trace"] if arg_trace else [] +- cmd = [sys.executable, ESPTOOL_PY] + trace_args ++ cmd = [ESPTOOL_PY] + trace_args + if chip_name or arg_chip is not None and chip_name != "auto": + cmd += ["--chip", chip_name or arg_chip] + if rfc2217_port or arg_port is not None: +diff --git a/test/test_imagegen.py b/test/test_imagegen.py +index a1feec2..01bd59c 100755 +--- a/test/test_imagegen.py ++++ b/test/test_imagegen.py +@@ -108,7 +108,7 @@ class BaseTestCase: + Run esptool.py image_info on a binary file, + assert no red flags about contents. + """ +- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "image_info", binpath] ++ cmd = [ESPTOOL_PY, "--chip", chip, "image_info", binpath] + try: + output = subprocess.check_output(cmd) + output = output.decode("utf-8") +@@ -123,7 +123,7 @@ class BaseTestCase: + + def run_elf2image(self, chip, elf_path, version=None, extra_args=[]): + """Run elf2image on elf_path""" +- cmd = [sys.executable, ESPTOOL_PY, "--chip", chip, "elf2image"] ++ cmd = [ESPTOOL_PY, "--chip", chip, "elf2image"] + if version is not None: + cmd += ["--version", str(version)] + cmd += [elf_path] + extra_args +diff --git a/test/test_merge_bin.py b/test/test_merge_bin.py +index 8230069..2df5f8c 100755 +--- a/test/test_merge_bin.py ++++ b/test/test_merge_bin.py +@@ -39,7 +39,6 @@ class TestMergeBin: + output_file.close() + + cmd = [ +- sys.executable, + ESPTOOL_PY, + "--chip", + chip, From 457b8403c159be5573de479c75e22b21e21b7daa Mon Sep 17 00:00:00 2001 From: figsoda Date: Sun, 27 Nov 2022 14:50:29 -0500 Subject: [PATCH 58/62] nix-update: 0.9.0 -> 0.10.0 Diff: https://github.com/Mic92/nix-update/compare/0.9.0...0.10.0 --- pkgs/tools/package-management/nix-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/package-management/nix-update/default.nix b/pkgs/tools/package-management/nix-update/default.nix index 71af0ab1d159..600e8027edaa 100644 --- a/pkgs/tools/package-management/nix-update/default.nix +++ b/pkgs/tools/package-management/nix-update/default.nix @@ -8,14 +8,14 @@ buildPythonApplication rec { pname = "nix-update"; - version = "0.9.0"; + version = "0.10.0"; format = "setuptools"; src = fetchFromGitHub { owner = "Mic92"; repo = pname; rev = version; - sha256 = "sha256-wivScgtcdapf5bfXR1sjuBIPQEgi6QGH/f+Aucc3CEQ="; + sha256 = "sha256-BChN92gZ1Ga7hIPWmdzkrg31S0iqWwXGkWb3mmRugY8="; }; makeWrapperArgs = [ From cdad0ce127b0b32ae8c5c07233f44dd63a85661a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 27 Nov 2022 21:57:35 +0100 Subject: [PATCH 59/62] nixos/filesystems: fix a typo in docs --- nixos/modules/tasks/filesystems.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/filesystems.nix b/nixos/modules/tasks/filesystems.nix index 7ab8f8dc676c..a093baea6a65 100644 --- a/nixos/modules/tasks/filesystems.nix +++ b/nixos/modules/tasks/filesystems.nix @@ -33,7 +33,7 @@ let mountPoint = mkOption { example = "/mnt/usb"; type = nonEmptyWithoutTrailingSlash; - description = lib.mdDoc "Location of the mounted the file system."; + description = lib.mdDoc "Location of the mounted file system."; }; device = mkOption { From df6b943ad047cdfac3d6a82a339d0572a0db2cd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Nov 2022 12:25:03 -0800 Subject: [PATCH 60/62] esptool_3: init at 3.3.2 --- pkgs/tools/misc/esptool/3.nix | 63 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/misc/esptool/3.nix diff --git a/pkgs/tools/misc/esptool/3.nix b/pkgs/tools/misc/esptool/3.nix new file mode 100644 index 000000000000..3ffa79b8c8bb --- /dev/null +++ b/pkgs/tools/misc/esptool/3.nix @@ -0,0 +1,63 @@ +{ lib, fetchFromGitHub, python3, openssl }: + +python3.pkgs.buildPythonApplication rec { + pname = "esptool"; + version = "3.3.2"; + + src = fetchFromGitHub { + owner = "espressif"; + repo = "esptool"; + rev = "v${version}"; + hash = "sha256-hpPL9KNPA+S57SJoKnQewBCOybDbKep0t5RKw9a9GjM="; + }; + + postPatch = '' + substituteInPlace test/test_imagegen.py \ + --replace "sys.executable, ESPTOOL_PY" "ESPTOOL_PY" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + bitstring + cryptography + ecdsa + pyserial + reedsolo + ]; + + # wrapPythonPrograms will overwrite esptool.py with a bash script, + # but espefuse.py tries to import it. Since we don't add any binary paths, + # use patchPythonScript directly. + dontWrapPythonPrograms = true; + postFixup = '' + buildPythonPath "$out $pythonPath" + for f in $out/bin/*.py; do + echo "Patching $f" + patchPythonScript "$f" + done + ''; + + checkInputs = with python3.pkgs; [ + pyelftools + ]; + + # tests mentioned in `.github/workflows/test_esptool.yml` + checkPhase = '' + runHook preCheck + + export ESPTOOL_PY=$out/bin/esptool.py + ${python3.interpreter} test/test_imagegen.py + ${python3.interpreter} test/test_espsecure.py + ${python3.interpreter} test/test_merge_bin.py + ${python3.interpreter} test/test_modules.py + + runHook postCheck + ''; + + meta = with lib; { + description = "ESP8266 and ESP32 serial bootloader utility"; + homepage = "https://github.com/espressif/esptool"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ hexa ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2ef429e339d9..d76d2362c8c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3987,6 +3987,8 @@ with pkgs; esptool = callPackage ../tools/misc/esptool { }; + esptool_3 = callPackage ../tools/misc/esptool/3.nix { }; + esptool-ck = callPackage ../tools/misc/esptool-ck { }; ephemeralpg = callPackage ../development/tools/database/ephemeralpg {}; From 10492770b2e395d33099df87755821f212a73a2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 27 Nov 2022 12:27:41 -0800 Subject: [PATCH 61/62] esphome: use esptool_3 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index a214a210d78f..607db114d9fb 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -2,7 +2,7 @@ , python3 , fetchFromGitHub , platformio -, esptool +, esptool_3 , git }: @@ -66,7 +66,7 @@ with python.pkgs; buildPythonApplication rec { # platformio is used in esphomeyaml/platformio_api.py # esptool is used in esphomeyaml/__main__.py # git is used in esphomeyaml/writer.py - "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}" + "--prefix PATH : ${lib.makeBinPath [ platformio esptool_3 git ]}" "--set ESPHOME_USE_SUBPROCESS ''" ]; From f2135573fb044e0305376e071c1dd4d2db3fc9b1 Mon Sep 17 00:00:00 2001 From: maralorn Date: Mon, 28 Nov 2022 00:33:18 +0100 Subject: [PATCH 62/62] nix-output-monitor: 2.0.0.4 -> 2.0.0.5 https://github.com/maralorn/nix-output-monitor/releases/tag/v2.0.0.5 --- pkgs/tools/nix/nix-output-monitor/generated-package.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/nix/nix-output-monitor/generated-package.nix b/pkgs/tools/nix/nix-output-monitor/generated-package.nix index 5f924c81a4e1..b2490a211b88 100644 --- a/pkgs/tools/nix/nix-output-monitor/generated-package.nix +++ b/pkgs/tools/nix/nix-output-monitor/generated-package.nix @@ -22,7 +22,6 @@ mtl, nix-derivation, optics, - process, random, relude, safe, @@ -39,10 +38,10 @@ }: mkDerivation { pname = "nix-output-monitor"; - version = "2.0.0.4"; + version = "2.0.0.5"; src = fetchzip { - url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.4.tar.gz"; - sha256 = "1pgrynsjjry253fqpmm3yr4k9xcvqffnbs4p8i1nlfi9l821wj8c"; + url = "https://github.com/maralorn/nix-output-monitor/archive/refs/tags/v2.0.0.5.tar.gz"; + sha256 = "02xrbf2nr64yfny3idkjb1xbd97wl8m5viifrwjf4hi6ivs5bl18"; }; isLibrary = true; isExecutable = true; @@ -126,7 +125,6 @@ mkDerivation { mtl nix-derivation optics - process random relude safe @@ -137,6 +135,7 @@ mkDerivation { terminal-size text time + typed-process wcwidth word8 ];