From 16e24b17eaa2d2d6e637990ad9f8cad416032fef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 16 Aug 2022 23:03:34 +0000 Subject: [PATCH 001/176] svt-av1: 1.2.0 -> 1.2.1 --- pkgs/tools/video/svt-av1/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/video/svt-av1/default.nix b/pkgs/tools/video/svt-av1/default.nix index 3d633c2da254..2a6d4e476ce2 100644 --- a/pkgs/tools/video/svt-av1/default.nix +++ b/pkgs/tools/video/svt-av1/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "svt-av1"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitLab { owner = "AOMediaCodec"; repo = "SVT-AV1"; rev = "v${version}"; - sha256 = "sha256-mUWWYaExEd/WkIYb1d8AduioHBxGp4Nn7Trhe2vv6Z0="; + sha256 = "sha256-gK2Yabh9AwAX1AecOPGTOthE4ENCA4NIjwWNJNkXxJc="; }; nativeBuildInputs = [ cmake nasm ]; From 656e3022f4caa11905bad996866bf07b848afc0b Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 26 Jun 2022 13:05:18 +0800 Subject: [PATCH 002/176] fetch-cargo-tarball: allow use index mirror --- .../rust/fetch-cargo-tarball/default.nix | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index 2f1f3547dbb0..e2ee870f22a3 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -58,9 +58,18 @@ in stdenv.mkDerivation ({ export CARGO_HOME=$(mktemp -d cargo-home.XXX) CARGO_CONFIG=$(mktemp cargo-config.XXXX) + if [[ -n "$NIX_CRATES_INDEX" ]]; then + cat >$CARGO_HOME/config.toml < $CARGO_CONFIG + cargo vendor $name --respect-source-config | cargo-vendor-normalise > $CARGO_CONFIG # Add the Cargo.lock to allow hash invalidation cp Cargo.lock.orig $name/Cargo.lock @@ -81,7 +90,7 @@ in stdenv.mkDerivation ({ inherit (hash_) outputHashAlgo outputHash; - impureEnvVars = lib.fetchers.proxyImpureEnvVars; + impureEnvVars = lib.fetchers.proxyImpureEnvVars ++ [ "NIX_CRATES_INDEX" ]; } // (builtins.removeAttrs args [ "name" "sha256" "cargoUpdateHook" "nativeBuildInputs" ])) From 51a6ac79d2971ed44994af138914a70c1b04762d Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 26 Jun 2022 13:07:01 +0800 Subject: [PATCH 003/176] fetch-cargo-tarball: fix for packages without dep --- .../rust/fetch-cargo-tarball/cargo-vendor-normalise.py | 4 +++- pkgs/build-support/rust/fetch-cargo-tarball/default.nix | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/cargo-vendor-normalise.py b/pkgs/build-support/rust/fetch-cargo-tarball/cargo-vendor-normalise.py index 2d7a18957184..90933b089c92 100755 --- a/pkgs/build-support/rust/fetch-cargo-tarball/cargo-vendor-normalise.py +++ b/pkgs/build-support/rust/fetch-cargo-tarball/cargo-vendor-normalise.py @@ -13,7 +13,9 @@ def quote(s: str) -> str: def main() -> None: data = toml.load(sys.stdin) - assert list(data.keys()) == ["source"] + # There is no dependency to vendor in this project. + if not list(data.keys()) == ["source"]: + return # this value is non deterministic data["source"]["vendored-sources"]["directory"] = "@vendor@" diff --git a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix index e2ee870f22a3..6d6219078bac 100644 --- a/pkgs/build-support/rust/fetch-cargo-tarball/default.nix +++ b/pkgs/build-support/rust/fetch-cargo-tarball/default.nix @@ -71,6 +71,8 @@ in stdenv.mkDerivation ({ cargo vendor $name --respect-source-config | cargo-vendor-normalise > $CARGO_CONFIG + # Create an empty vendor directory when there is no dependency to vendor + mkdir -p $name # Add the Cargo.lock to allow hash invalidation cp Cargo.lock.orig $name/Cargo.lock From 64a83a9b83b9eaefb42da521f4f3f7945dbaede2 Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 21 Aug 2022 17:08:57 +0800 Subject: [PATCH 004/176] elfcat: add cargoHash --- pkgs/tools/misc/elfcat/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/misc/elfcat/default.nix b/pkgs/tools/misc/elfcat/default.nix index e2dec357d6d2..359bd6d3ab93 100644 --- a/pkgs/tools/misc/elfcat/default.nix +++ b/pkgs/tools/misc/elfcat/default.nix @@ -11,8 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-NzFKNCCPWBj/fhaEJF34nyeyvLMeQwIcQgTlYc6mgYo="; }; - # There is no dependency to vendor in this project. - cargoLock.lockFile = ./Cargo.lock; + cargoHash = "sha256-Dc+SuLwbLFcNSr9RiNSc7dgisBOvOUEIDR8dFAkC/O0="; meta = with lib; { description = "ELF visualizer, generates HTML files from ELF binaries."; From 7d8f9ee62ea2aab31b3e71e499302d67861718db Mon Sep 17 00:00:00 2001 From: linsui Date: Sun, 21 Aug 2022 17:09:09 +0800 Subject: [PATCH 005/176] build-rust-package: cargoSha256 and cargoHash must not be null --- pkgs/build-support/rust/build-rust-package/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/build-support/rust/build-rust-package/default.nix b/pkgs/build-support/rust/build-rust-package/default.nix index 95b6f357e56a..db0d2c53bb1e 100644 --- a/pkgs/build-support/rust/build-rust-package/default.nix +++ b/pkgs/build-support/rust/build-rust-package/default.nix @@ -52,8 +52,9 @@ , buildAndTestSubdir ? null , ... } @ args: -assert cargoVendorDir == null && cargoLock == null -> !(args ? cargoSha256) && !(args ? cargoHash) - -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set"; +assert cargoVendorDir == null && cargoLock == null + -> !(args ? cargoSha256 && args.cargoSha256 != null) && !(args ? cargoHash && args.cargoHash != null) + -> throw "cargoSha256, cargoHash, cargoVendorDir, or cargoLock must be set"; assert buildType == "release" || buildType == "debug"; let From 06b6e303b02bffb16e83ec9cd41e453700371cd8 Mon Sep 17 00:00:00 2001 From: Cody P Schafer Date: Mon, 22 Aug 2022 22:11:42 -0400 Subject: [PATCH 006/176] vid-stab: 1.1.0 -> unstable-2022-05-30, fix linking against it with clang - vid-stab 1.1.0 (current release) hardcodes libgomp in its pkg-config. Current git version includes a commit fixing this, so this change updates to the git versions - placing openmp in `buildInputs` causes it not to be present when linking against vid-stab, causing linking to fail. Move it to `propagatedBuildInputs` to resolve - the all-packages.nix change enables vid-stab in (for example) ffmpeg on macos (where it was previously disabled). --- pkgs/development/libraries/vid-stab/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/vid-stab/default.nix b/pkgs/development/libraries/vid-stab/default.nix index d224c2f3be58..a1eb5cf53e5d 100644 --- a/pkgs/development/libraries/vid-stab/default.nix +++ b/pkgs/development/libraries/vid-stab/default.nix @@ -2,18 +2,18 @@ stdenv.mkDerivation rec { pname = "vid.stab"; - version = "1.1.0"; + version = "unstable-2022-05-30"; src = fetchFromGitHub { owner = "georgmartius"; repo = pname; - rev = "v${version}"; - sha256 = "0a3frpm2kdbx7vszhg64p3alisag73bcspl7fp3a2f1kgq7rbh38"; + rev = "90c76aca2cb06c3ff6f7476a7cd6851b39436656"; + sha256 = "sha256-p1VRnkBeUpET3O2FmaJMyN5/EoSOQLdmRIVbzZcQaKY="; }; nativeBuildInputs = [ cmake ]; - buildInputs = lib.optionals stdenv.cc.isClang [ openmp ]; + propagatedBuildInputs = lib.optionals stdenv.cc.isClang [ openmp ]; meta = with lib; { description = "Video stabilization library"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e905eb55423..852414438326 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17846,7 +17846,6 @@ with pkgs; libmfx = if stdenv.isDarwin then null else intel-media-sdk; libpulseaudio = if stdenv.isDarwin then null else libpulseaudio; samba = if stdenv.isDarwin then null else samba; - vid-stab = if stdenv.isDarwin then null else vid-stab; inherit (darwin.apple_sdk.frameworks) Cocoa CoreServices CoreAudio AVFoundation MediaToolbox VideoDecodeAcceleration; From e0a5a1c3a0851aeb6e896bfe52b212c30f9ce3c7 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:47:02 -0700 Subject: [PATCH 007/176] rPackages: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC. --- pkgs/development/r-modules/generic-builder.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/r-modules/generic-builder.nix b/pkgs/development/r-modules/generic-builder.nix index beb669d9893f..880fff44ed64 100644 --- a/pkgs/development/r-modules/generic-builder.nix +++ b/pkgs/development/r-modules/generic-builder.nix @@ -10,8 +10,6 @@ stdenv.mkDerivation ({ NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1"; - hardeningDisable = lib.optionals (stdenv.isAarch64 && stdenv.isDarwin) [ "stackprotector" ]; - configurePhase = '' runHook preConfigure export R_LIBS_SITE="$R_LIBS_SITE''${R_LIBS_SITE:+:}$out/library" From a813457d190b863e1de3d9cb48c4f2b8f1cd46b3 Mon Sep 17 00:00:00 2001 From: Theodore Ni <3806110+tjni@users.noreply.github.com> Date: Sun, 4 Sep 2022 11:57:11 -0700 Subject: [PATCH 008/176] gerbil: reenable stackprotector on aarch64-darwin The original error that required disabling the stack protector on aarch64-darwin has been fixed in GCC. --- pkgs/development/compilers/gerbil/build.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pkgs/development/compilers/gerbil/build.nix b/pkgs/development/compilers/gerbil/build.nix index 040f17ff2850..3d2fd7551e67 100644 --- a/pkgs/development/compilers/gerbil/build.nix +++ b/pkgs/development/compilers/gerbil/build.nix @@ -21,15 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ gambit ] ++ buildInputs_libraries; # ++ buildInputs_staticLibraries; - # disable stackprotector on aarch64-darwin for now - # build error: - # ``` - # /private/tmp/nix-build-gerbil-unstable-2020-11-05.drv-0/ccjyhWKi.s:326:15: error: index must be an integer in range [-256, 255]. - # ldr x2, [x2, ___stack_chk_guard];momd - # ^ - # ``` - hardeningDisable = lib.optionals (gccStdenv.isAarch64 && gccStdenv.isDarwin) [ "stackprotector" ]; - NIX_CFLAGS_COMPILE = "-I${libmysqlclient}/include/mysql -L${libmysqlclient}/lib/mysql"; postPatch = '' From 3cac015a69c68eb89906ed75ca0528ada595f844 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 9 Sep 2022 04:48:47 +0000 Subject: [PATCH 009/176] wiki-js: 2.5.286 -> 2.5.287 --- pkgs/servers/web-apps/wiki-js/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/wiki-js/default.nix b/pkgs/servers/web-apps/wiki-js/default.nix index 7f67ff07532d..6e80e3770179 100644 --- a/pkgs/servers/web-apps/wiki-js/default.nix +++ b/pkgs/servers/web-apps/wiki-js/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "wiki-js"; - version = "2.5.286"; + version = "2.5.287"; src = fetchurl { url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz"; - sha256 = "sha256-jxnWUSvTldaIX21PryZiR4UlWmxs03gcGohOmnyDGS8="; + sha256 = "sha256-6BtyDutVHFzOB1MXO2PIBbhyXveTa8M09m9qv+OKQ04="; }; sourceRoot = "."; From d7f7edc29cc33e5bd83ccf674cfdd0e26e1c1ca2 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sat, 10 Sep 2022 08:49:58 +0800 Subject: [PATCH 010/176] libime: 2022-07-11 -> 1.0.14 --- pkgs/development/libraries/libime/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libime/default.nix b/pkgs/development/libraries/libime/default.nix index 85d5c30691c1..d1f14664344d 100644 --- a/pkgs/development/libraries/libime/default.nix +++ b/pkgs/development/libraries/libime/default.nix @@ -13,26 +13,26 @@ let url = "https://download.fcitx-im.org/data/table.tar.gz"; sha256 = "1dw7mgbaidv3vqy0sh8dbfv8631d2zwv5mlb7npf69a1f8y0b5k1"; }; - arpaVer = "20220630"; + arpaVer = "20220810"; arpa = fetchurl { url = "https://download.fcitx-im.org/data/lm_sc.arpa-${arpaVer}.tar.xz"; - sha256 = "sha256-jTsPqPoWuT0NRZDwLaBAKcJxNktZJcHJAoRcN0oqAL8="; + sha256 = "sha256-oRvJfSda2vGV+brIVDaK4GzbSg/h7s9Z21rlgGFdtPo="; }; - dictVer = "20220706"; + dictVer = "20220810"; dict = fetchurl { url = "https://download.fcitx-im.org/data/dict-${dictVer}.tar.xz"; - sha256 = "sha256-vNeR//eDr7QMHI6S2z+Dc0+Lk8nGriwV4eqHeLkHB3k="; + sha256 = "sha256-lxdS9BMYgAfo0ZFYwRuFyVXiXXsyHsInXEs69tioXSY="; }; in stdenv.mkDerivation rec { pname = "libime"; - version = "unstable-2022-07-11"; + version = "1.0.14"; src = fetchFromGitHub { owner = "fcitx"; repo = "libime"; - rev = "1adb14eb0617ef0eb0f07ad99684f43ca8a4395c"; - sha256 = "sha256-UldswsnkMuJh2G/EdsFl4CS7Y2RSRAb1hYeWUA2MHPw="; + rev = version; + sha256 = "sha256-O89Op2dxuhGgCxuy2GLI0waCgDreJKNQ5tTvsx/0/fk="; fetchSubmodules = true; }; From f00da34f2cabcef66b5f179ceab67dcf58340573 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sat, 10 Sep 2022 08:50:11 +0800 Subject: [PATCH 011/176] fcitx5: 5.0.18 -> 5.0.19 --- pkgs/tools/inputmethods/fcitx5/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/default.nix b/pkgs/tools/inputmethods/fcitx5/default.nix index 9dfa5a702f2e..de2c777a64aa 100644 --- a/pkgs/tools/inputmethods/fcitx5/default.nix +++ b/pkgs/tools/inputmethods/fcitx5/default.nix @@ -41,17 +41,17 @@ let in stdenv.mkDerivation rec { pname = "fcitx5"; - version = "5.0.18"; + version = "5.0.19"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-ZhjNUWzi74lr8Wtf0f+VN1kc9C6q2TJ9ogXeu3NJKbI="; + sha256 = "sha256-hgg7Sbe5/tAWWq2to9PceBQeUdV3UWENFgvuY0qCksM="; }; prePatch = '' - ln -s ${enDict} src/modules/spell/dict/$(stripHash ${enDict}) + ln -s ${enDict} src/modules/spell/$(stripHash ${enDict}) ''; nativeBuildInputs = [ From c0b5ab7841a67b158ed35e68faae0c39260dff0f Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sat, 10 Sep 2022 08:50:21 +0800 Subject: [PATCH 012/176] fcitx5-chinese-addons: 5.0.14 -> 5.0.15 --- pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix index 18da967c048b..e4455fdb551b 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-chinese-addons.nix @@ -31,13 +31,13 @@ in mkDerivation rec { pname = "fcitx5-chinese-addons"; - version = "5.0.14"; + version = "5.0.15"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-ZIOPzRXW+aaVKDIBC3N04wx662r8WOa205CgTeYmudQ="; + sha256 = "sha256-9AGL0eAkaA2N/aE8VlgRCnW2lAl55SroBumeU5xkW5M="; }; cmakeFlags = [ From b7029e3c81682170acab831a5c4594c05a3f14f6 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sat, 10 Sep 2022 08:50:28 +0800 Subject: [PATCH 013/176] fcitx5-gtk: 5.0.17 -> 5.0.18 --- pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix index d71fca87ab24..43905dfac913 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-gtk.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-gtk"; - version = "5.0.17"; + version = "5.0.18"; src = fetchFromGitHub { owner = "fcitx"; repo = pname; rev = version; - sha256 = "sha256-sAPbbMoZ4NGiE7lbtcdzQQsPib6i52JwWsLe+bmTshU="; + sha256 = "sha256-rQ2HLiI0dIerxRV+fbHpTJy4aGmFKmGd6YckKxXmp4s="; }; cmakeFlags = [ From eb1df01d46e245119c809ca175d7927ea2474d9a Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sun, 11 Sep 2022 15:39:41 +0100 Subject: [PATCH 014/176] opencolorio: fix build on darwin x86_64 use macos sdk 11.0 to allow Metal support to compile, but revert use of -hidden-l because our toolchain on darwin x86_64 is too old to support that --- pkgs/development/libraries/opencolorio/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 4 ++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opencolorio/default.nix b/pkgs/development/libraries/opencolorio/default.nix index 81ab688b6436..dd6c31792b10 100644 --- a/pkgs/development/libraries/opencolorio/default.nix +++ b/pkgs/development/libraries/opencolorio/default.nix @@ -1,6 +1,7 @@ { stdenv , lib , fetchFromGitHub +, fetchpatch , cmake , expat , libyamlcpp @@ -35,6 +36,15 @@ stdenv.mkDerivation rec { sha256 = "sha256-e1PpWjjfSjtgN9Rs/+lsA45Z9S4y4T6nqrJ02DZ4vjs="; }; + patches = [ + (fetchpatch { + name = "darwin-no-hidden-l.patch"; + url = "https://github.com/AcademySoftwareFoundation/OpenColorIO/commit/48bab7c643ed8d108524d718e5038d836f906682.patch"; + revert = true; + sha256 = "sha256-0DF+lwi2nfkUFG0wYvL3HYbhZS6SqGtPWoOabrFS1Eo="; + }) + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ expat diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1090104cccfd..7d27de71e755 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20871,8 +20871,8 @@ with pkgs; openldap = callPackage ../development/libraries/openldap { }; - opencolorio = callPackage ../development/libraries/opencolorio { - inherit (darwin.apple_sdk.frameworks) Carbon GLUT Cocoa; + opencolorio = darwin.apple_sdk_11_0.callPackage ../development/libraries/opencolorio { + inherit (darwin.apple_sdk_11_0.frameworks) Carbon GLUT Cocoa; }; opencolorio_1 = callPackage ../development/libraries/opencolorio/1.x.nix { }; From 8d3a55ba445ccf2e978d3bf37ec07057ff6e7c92 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 00:00:40 +0000 Subject: [PATCH 015/176] oneDNN: 2.6.1 -> 2.6.2 --- pkgs/development/libraries/oneDNN/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 8137f2b55b31..7286a0913a96 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.6.1"; + version = "2.6.2"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-cO8hT5ZrA9VegxOFH9fHm3YKK4A6XmaWIAfPTytNu6I="; + sha256 = "sha256-CJbgmarN30UtRSKd7I2UZgDTkyhwj7k+QAtYhRnFkXQ="; }; outputs = [ "out" "dev" "doc" ]; From 9b3213ba9939989413488d4e1518be9ed00c1949 Mon Sep 17 00:00:00 2001 From: Osama Rebach Date: Mon, 12 Sep 2022 00:10:35 +0100 Subject: [PATCH 016/176] Handle melpa new fetchers (sourcehut, codeberg) --- .../applications/editors/emacs/elisp-packages/update-melpa.el | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el index c8c1bfee566b..a900d1bedd34 100644 --- a/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el +++ b/pkgs/applications/editors/emacs/elisp-packages/update-melpa.el @@ -103,6 +103,10 @@ return Promise to resolve in that process." (url-hexify-string repo) "/repository/archive.tar.gz?ref=" commit))) + ("sourcehut" (list "nix-prefetch-url" + "--unpack" (concat "https://git.sr.ht/~" repo "/archive/" commit ".tar.gz"))) + ("codeberg" (list "nix-prefetch-url" + "--unpack" (concat "https://codeberg.org/" repo "/archive/" commit ".tar.gz"))) ("bitbucket" (list "nix-prefetch-hg" (concat "https://bitbucket.com/" repo) commit)) ("hg" (list "nix-prefetch-hg" From 53769ebc79e6de6c6bda995277dc7f7b63ddb421 Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Wed, 7 Sep 2022 14:05:58 +0530 Subject: [PATCH 017/176] immudb: init at 1.3.2 --- pkgs/servers/nosql/immudb/default.nix | 65 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 67 insertions(+) create mode 100644 pkgs/servers/nosql/immudb/default.nix diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/servers/nosql/immudb/default.nix new file mode 100644 index 000000000000..95a8299ddaf3 --- /dev/null +++ b/pkgs/servers/nosql/immudb/default.nix @@ -0,0 +1,65 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, fetchzip +, installShellFiles +}: + +let + webconsoleVersion = "1.0.17"; + webconsoleDist = fetchzip { + url = "https://github.com/codenotary/immudb-webconsole/releases/download/v${webconsoleVersion}/immudb-webconsole.tar.gz"; + sha256 = "sha256-hFSvPwSRXyrSBYktTOwIRa1+aH+mX/scDYDokvZuW1s="; + }; + +in +buildGoModule rec { + pname = "immudb"; + version = "1.3.2"; + + src = fetchFromGitHub { + owner = "codenotary"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-lcKjeqZeTQQMhVjnWNP3c+HanI/eenfUbpZJAo5FEkM="; + }; + + preBuild = '' + mkdir -p webconsole/dist + cp -r ${webconsoleDist}/* ./webconsole/dist + go generate -tags webconsole ./webconsole + ''; + + proxyVendor = true; # check if this is needed anymore when updating + + vendorSha256 = "sha256-gMpkV0XqY6wh7s0lndIdCoYlvVBrMk7/lvyDVqnJ66c="; + + nativeBuildInputs = [ installShellFiles ]; + + tags = [ "webconsole" ]; + + ldflags = [ "-X github.com/codenotary/immudb/cmd/version.Version=${version}" ]; + + subPackages = [ + "cmd/immudb" + "cmd/immuclient" + "cmd/immuadmin" + ]; + + postInstall = '' + mkdir -p share/completions + for executable in immudb immuclient immuadmin; do + for shell in bash fish zsh; do + $out/bin/$executable completion $shell > share/completions/$executable.$shell + installShellCompletion share/completions/$executable.$shell + done + done + ''; + + meta = with lib; { + description = "Immutable database based on zero trust, SQL and Key-Value, tamperproof, data change history"; + homepage = "https://github.com/codenotary/immudb"; + license = licenses.asl20; + maintainers = with maintainers; [ dit7ya ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 915e23056427..0c3d5f1f1a86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -23241,6 +23241,8 @@ with pkgs; percona-server56 = callPackage ../servers/sql/percona/5.6.x.nix { stdenv = gcc10StdenvCompat; }; percona-server = percona-server56; + immudb = callPackage ../servers/nosql/immudb { }; + influxdb = callPackage ../servers/nosql/influxdb { # pinned due to build failure or vendoring problems. When unpinning double check with: nix-build -A $name.go-modules --rebuild buildGoModule = buildGo117Module; From c006419bc9b6ae49f4e885b54bbd21c7682885ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 12 Sep 2022 05:50:24 +0000 Subject: [PATCH 018/176] intel-media-sdk: 22.5.2 -> 22.5.3 --- pkgs/development/libraries/intel-media-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/intel-media-sdk/default.nix b/pkgs/development/libraries/intel-media-sdk/default.nix index 5ec0eabf1fcd..288f12ac1fcf 100644 --- a/pkgs/development/libraries/intel-media-sdk/default.nix +++ b/pkgs/development/libraries/intel-media-sdk/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "intel-media-sdk"; - version = "22.5.2"; + version = "22.5.3"; src = fetchFromGitHub { owner = "Intel-Media-SDK"; repo = "MediaSDK"; rev = "intel-mediasdk-${version}"; - sha256 = "sha256-HBG1JsTwAbl7p42Crmx82M7VnIaLk0oBXc4SJoIdEIs="; + sha256 = "sha256-oWwES0XKjhVGPVsPo4t9WWorm+4J6lMPa+/pSY7r6I0="; }; nativeBuildInputs = [ cmake pkg-config ]; From 7073dcc0903f41b7ea23c2d407a9f9b22c13a5df Mon Sep 17 00:00:00 2001 From: linsui Date: Mon, 12 Sep 2022 14:38:14 +0800 Subject: [PATCH 019/176] variety: add app indicator support --- pkgs/applications/misc/variety/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/variety/default.nix b/pkgs/applications/misc/variety/default.nix index 10b98e0642c0..83c3fb69d19c 100644 --- a/pkgs/applications/misc/variety/default.nix +++ b/pkgs/applications/misc/variety/default.nix @@ -15,6 +15,8 @@ , feh , imagemagickSupport ? true , imagemagick +, appindicatorSupport ? true +, libayatana-appindicator-gtk3 }: python3.pkgs.buildPythonApplication rec { @@ -41,7 +43,8 @@ python3.pkgs.buildPythonApplication rec { hicolor-icon-theme libnotify librsvg - ]; + ] + ++ lib.optional appindicatorSupport libayatana-appindicator-gtk3; propagatedBuildInputs = with python3.pkgs; [ beautifulsoup4 From 2bf2f4583a269c110d17fbc268c9b44f88ee91ed Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 12 Sep 2022 16:06:18 -0300 Subject: [PATCH 020/176] shellhub-agent: 0.9.6 -> 0.10.1 Signed-off-by: Otavio Salvador --- pkgs/applications/networking/shellhub-agent/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/shellhub-agent/default.nix b/pkgs/applications/networking/shellhub-agent/default.nix index f702eb7bfd5c..2cff80dd7301 100644 --- a/pkgs/applications/networking/shellhub-agent/default.nix +++ b/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.6"; + version = "0.10.1"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "Ag1rwBWeVUBKxnsIGNDwz9UmHwpklwF6UjM8IPudZTs="; + sha256 = "jeZh1vPXUN/jcf306S6KdIeHygci+4+uky4MXQgRlpA="; }; modRoot = "./agent"; - vendorSha256 = "sha256-UDsgfsdq8DecyTAFrmWO09V3JIuTA5YLCEAei0tYRy4="; + vendorSha256 = "sha256-AqtDI1GFw4cduFdWRSh9lYe/OwvEdu5iB0+ud8QPgXM="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; From 97b0196da51300190293de357779d5e1a8618124 Mon Sep 17 00:00:00 2001 From: Justinas Stankevicius Date: Mon, 12 Sep 2022 23:19:03 +0300 Subject: [PATCH 021/176] jellyfin-ffmpeg: 5.1-2 -> 5.1.1-1 --- .../libraries/jellyfin-ffmpeg/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix index bb95fa5606fb..d24ca8de9f95 100644 --- a/pkgs/development/libraries/jellyfin-ffmpeg/default.nix +++ b/pkgs/development/libraries/jellyfin-ffmpeg/default.nix @@ -2,35 +2,25 @@ , nv-codec-headers-11 , fetchFromGitHub , lib -, fetchpatch }: (ffmpeg_5-full.override { nv-codec-headers = nv-codec-headers-11; }).overrideAttrs (old: rec { pname = "jellyfin-ffmpeg"; - version = "5.1-2"; + version = "5.1.1-1"; src = fetchFromGitHub { owner = "jellyfin"; repo = "jellyfin-ffmpeg"; rev = "v${version}"; - sha256 = "sha256-lw2W65mbBhiSnegxLSRqDz2WMM82ght/KB4i+5BiL4o="; + sha256 = "sha256-WxUADm5z6SH6Xegi2dhhien5IBY/Y/ZZaXr7MdOvpYA="; }; configureFlags = old.configureFlags ++ [ "--disable-ptx-compression" # https://github.com/jellyfin/jellyfin/issues/7944#issuecomment-1156880067 ]; - patches = old.patches ++ [ - # fixed in upstream ffmpeg 5.1.1 https://trac.ffmpeg.org/ticket/9841 - (fetchpatch { - name = "rename-imf-fate-target.patch"; - url = "https://github.com/FFmpeg/FFmpeg/commit/80d1b8938eb227f0e9efde91050836b1e9a051a9.patch"; - sha256 = "sha256-weUbLKSQ9iRYSQ3hgXcVpo8jfKajpXK21qD1GrZYHYQ="; - }) - ]; - postPatch = '' for file in $(cat debian/patches/series); do patch -p1 < debian/patches/$file From af91d05b1cd353d198c9619ef95d3ea31d5f2bf1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 00:08:32 +0000 Subject: [PATCH 022/176] libamqpcpp: 4.3.16 -> 4.3.17 --- pkgs/development/libraries/libamqpcpp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libamqpcpp/default.nix b/pkgs/development/libraries/libamqpcpp/default.nix index 2a1ea4f606d7..4c42ea8e2128 100644 --- a/pkgs/development/libraries/libamqpcpp/default.nix +++ b/pkgs/development/libraries/libamqpcpp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libamqpcpp"; - version = "4.3.16"; + version = "4.3.17"; src = fetchFromGitHub { owner = "CopernicaMarketingSoftware"; repo = "AMQP-CPP"; rev = "v${version}"; - sha256 = "sha256-aBLNdw9LhHFwnIt70vIYlX1/j2IUTmpm5Ub+ZImF8FI="; + sha256 = "sha256-DQzetwBpgXE1oG295DCc1m12LSbzRTD3khNbEe0O4Rg="; }; buildInputs = [ openssl ]; From bbbbe0e90058e0189cbba9b8cd041756fe586b47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 07:09:08 +0000 Subject: [PATCH 023/176] pluto: 5.10.6 -> 5.10.7 --- pkgs/applications/networking/cluster/pluto/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/pluto/default.nix b/pkgs/applications/networking/cluster/pluto/default.nix index e7e603c28c95..a88cda718d5d 100644 --- a/pkgs/applications/networking/cluster/pluto/default.nix +++ b/pkgs/applications/networking/cluster/pluto/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pluto"; - version = "5.10.6"; + version = "5.10.7"; src = fetchFromGitHub { owner = "FairwindsOps"; repo = "pluto"; rev = "v${version}"; - sha256 = "sha256-FNt+e13IEpIWB6gBYWfwJ+Qu7W/cyHvV+XGNhn17rdg="; + sha256 = "sha256-AGzDs2KZt44uBJRBHvBL7nn5TpgWbcdLTEf9Vx9j89U="; }; - vendorSha256 = "sha256-M/D7V6v4+BlROoxhT9URuj9EI6qXYG2VoXcCVN+j6aU="; + vendorSha256 = "sha256-cA5QxI1lLBdzPOj3pFqqHPfMwJQPPiyqQA4FLwetNUs="; ldflags = [ "-w" "-s" From 6bd6aa41431725616c873f6d49b126b985b41af7 Mon Sep 17 00:00:00 2001 From: Gabriel Arazas Date: Tue, 13 Sep 2022 15:26:52 +0800 Subject: [PATCH 024/176] ymuse: 0.20 -> 0.21 --- pkgs/applications/audio/ymuse/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/ymuse/default.nix b/pkgs/applications/audio/ymuse/default.nix index dc0fb16c452c..e59d42e10b48 100644 --- a/pkgs/applications/audio/ymuse/default.nix +++ b/pkgs/applications/audio/ymuse/default.nix @@ -14,15 +14,15 @@ buildGoModule rec { pname = "ymuse"; - version = "0.20"; + version = "0.21"; src = fetchFromGitHub { owner = "yktoo"; repo = "ymuse"; rev = "v${version}"; - sha256 = "sha256-wDQjNBxwxFVFdSswubp4AVD35aXKJ8i0ahk/tgRsDRc="; + sha256 = "sha256-3QgBbK7AK9/uQ6Z7DNIJxa1oXrxvvHDQ/Z2QOf7yfS4="; }; - vendorSha256 = "sha256-Ap/nf0NT0VkP2k9U1HzEiptDfLjKkBopP5h0czP3vis="; + vendorSha256 = "sha256-7oYYZWpvWzeHlp6l9bLeHcLITLZPVY5eZdfHSE+ZHW8="; nativeBuildInputs = [ pkg-config @@ -39,7 +39,8 @@ buildGoModule rec { ]; postInstall = '' - install -Dm644 ./resources/ymuse.desktop -t $out/share/applications + install -Dm644 ./resources/com.yktoo.ymuse.desktop -t $out/share/applications + install -Dm644 ./resources/metainfo/com.yktoo.ymuse.metainfo.xml -t $out/share/metainfo cp -r ./resources/icons $out/share app_id="ymuse" From 1f04d6b04bc99067dbce7d53fa235f96bc105a76 Mon Sep 17 00:00:00 2001 From: linsui Date: Tue, 13 Sep 2022 16:56:50 +0800 Subject: [PATCH 025/176] dotter: 0.12.13 -> 0.12.14 --- pkgs/tools/misc/dotter/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/dotter/default.nix b/pkgs/tools/misc/dotter/default.nix index 20699c52849f..1b252da0d822 100644 --- a/pkgs/tools/misc/dotter/default.nix +++ b/pkgs/tools/misc/dotter/default.nix @@ -2,6 +2,7 @@ , stdenv , fetchpatch , fetchFromGitHub +, nix-update-script , rustPlatform , CoreServices , which @@ -9,26 +10,31 @@ rustPlatform.buildRustPackage rec { pname = "dotter"; - version = "0.12.13"; + version = "0.12.14"; src = fetchFromGitHub { owner = "SuperCuber"; repo = "dotter"; rev = "v${version}"; - hash = "sha256-j3Dj43AbD0V5pZ6mM1uvPsqWAVJrmWyWvwC5NK1cRRY="; + hash = "sha256-GGbUpjAcihJLNNo0OtkRGQ2RcT/75vDABlHs7Atzo1s="; }; - cargoHash = "sha256-HPs55JBbYObunU0cSm/7lsu/DOk4ne9Ea9MCRJ427zo="; + cargoHash = "sha256-uC0OwN73krM7QaQ4rtWV6IseKdZmiqrB8a6QGTs6fHE="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; checkInputs = [ which ]; + passthru = { + updateScript = nix-update-script { + attrPath = pname; + }; + }; + meta = with lib; { description = "A dotfile manager and templater written in rust 🦀"; homepage = "https://github.com/SuperCuber/dotter"; license = licenses.unlicense; maintainers = with maintainers; [ linsui ]; - mainProgram = "dotter"; }; } From e89714e58969f90f0885560b13a639a41e7111c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 09:35:28 +0000 Subject: [PATCH 026/176] seaweedfs: 3.26 -> 3.27 --- pkgs/applications/networking/seaweedfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/seaweedfs/default.nix b/pkgs/applications/networking/seaweedfs/default.nix index cceca4f955c8..8c87d0ed4c2e 100644 --- a/pkgs/applications/networking/seaweedfs/default.nix +++ b/pkgs/applications/networking/seaweedfs/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "3.26"; + version = "3.27"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-ETpcBodT3zFwzc5tczgfw6pD3htb4xFzl0btkyODWk0="; + sha256 = "sha256-kvKUgw6A4UHOuDmKuOv+XS/0XiOf2ENWxl2WmJ4cVTE="; }; vendorSha256 = "sha256-sgLHRDdi9gkcSzeBaDCxtbvWSzjTshb2WbmMyRepUKA="; From 9990cf51b17f41a8acc45f54c4ee0ebf14680455 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 10:23:52 +0000 Subject: [PATCH 027/176] syft: 0.55.0 -> 0.56.0 --- pkgs/tools/admin/syft/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/syft/default.nix b/pkgs/tools/admin/syft/default.nix index a9faf35ec529..13f783dee063 100644 --- a/pkgs/tools/admin/syft/default.nix +++ b/pkgs/tools/admin/syft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "syft"; - version = "0.55.0"; + version = "0.56.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-tzrWgmEMe7y6PQgtYiN12LGR24FuaEvzOBAfgbIOepo="; + sha256 = "sha256-UEkBhVUapfHYQAUaYWHEpGgXn39Vb3NscWxynpob2MM="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -20,7 +20,7 @@ buildGoModule rec { find "$out" -name .git -print0 | xargs -0 rm -rf ''; }; - vendorSha256 = "sha256-HaTUjNKAZNiVcM4tZJb0r9ezsvWTlOicPct/ZtpTz5Y="; + vendorSha256 = "sha256-MxaY11CfcLWonm4SXI0mjnq29h9Hz8PdiY8eFrn42a0="; nativeBuildInputs = [ installShellFiles ]; From fbaa3b06d8b96bbf86dfb081c560744e91635d5d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 17:19:03 +0000 Subject: [PATCH 028/176] python310Packages.httptools: 0.4.0 -> 0.5.0 --- pkgs/development/python-modules/httptools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/httptools/default.nix b/pkgs/development/python-modules/httptools/default.nix index 963a9ff5ebfe..67c284abc3c7 100644 --- a/pkgs/development/python-modules/httptools/default.nix +++ b/pkgs/development/python-modules/httptools/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "httptools"; - version = "0.4.0"; + version = "0.5.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-LJqTDDeLPRXWtpX7levP+BpzlbT5d1xPEKB2vrCywf8="; + sha256 = "sha256-KVh0hhwXP5EBlgu6MyQpu3ftTc2M31zumSLrAOT2vAk="; }; # tests are not included in pypi tarball From 36f9500a0d14a79d01dd7082c49ecdaedf0b8c2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 20:43:25 +0000 Subject: [PATCH 029/176] python310Packages.sqlalchemy-continuum: 1.3.12 -> 1.3.13 --- .../python-modules/sqlalchemy-continuum/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix index d0970d4277d8..a97f3e4ddbd3 100644 --- a/pkgs/development/python-modules/sqlalchemy-continuum/default.nix +++ b/pkgs/development/python-modules/sqlalchemy-continuum/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "SQLAlchemy-Continuum"; - version = "1.3.12"; + version = "1.3.13"; src = fetchPypi { inherit pname version; - sha256 = "rlHl59MAQhsicMtZQT9rv1iQrDyVYJlawtyhvFaAM7o="; + sha256 = "sha256-JTqlHQmaVH2qKz7CFyCqpous3ecOpoFrxVlzasbc21I="; }; propagatedBuildInputs = [ From bdc6c12eb36a20883f5e3776b011d160d8a3fe33 Mon Sep 17 00:00:00 2001 From: janabhumi Date: Wed, 14 Sep 2022 00:02:58 +0300 Subject: [PATCH 030/176] exa: add gitSupport input parameter... for a more convenient way to configure the package. --- pkgs/tools/misc/exa/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 40fcc8b01c21..108155b6ad6d 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,5 +1,15 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, cmake, pandoc, pkg-config, zlib -, Security, libiconv, installShellFiles +{ lib +, gitSupport ? true +, stdenv +, fetchFromGitHub +, rustPlatform +, cmake +, pandoc +, pkg-config +, zlib +, Security +, libiconv +, installShellFiles }: rustPlatform.buildRustPackage rec { @@ -26,6 +36,9 @@ rustPlatform.buildRustPackage rec { buildInputs = [ zlib ] ++ lib.optionals stdenv.isDarwin [ libiconv Security ]; + buildNoDefaultFeatures = true; + buildFeatures = lib.optional gitSupport "git"; + outputs = [ "out" "man" ]; postInstall = '' From 5e5662a3749d93508135b7b4f0c52567a47d50bc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 13 Sep 2022 21:18:22 +0000 Subject: [PATCH 031/176] python310Packages.motor: 3.0.0 -> 3.1.0 --- pkgs/development/python-modules/motor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/motor/default.nix b/pkgs/development/python-modules/motor/default.nix index 030b22a723e2..06a17ffab15c 100644 --- a/pkgs/development/python-modules/motor/default.nix +++ b/pkgs/development/python-modules/motor/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "motor"; - version = "3.0.0"; + version = "3.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "mongodb"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-xq3EpTncnMskn3aJdLAtD/kKhn/cS2nrLrVliyh2z28="; + sha256 = "sha256-Wc0C4sO33v/frBtZVV2u9ESunHKyJI+eQ59l72h2eFk="; }; propagatedBuildInputs = [ pymongo ]; From 9c38b865d1785bf6dc207518a06cd060b43fea7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Sep 2022 04:44:40 +0000 Subject: [PATCH 032/176] python310Packages.pysensibo: 1.0.19 -> 1.0.20 --- pkgs/development/python-modules/pysensibo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix index 5bdf9979de9d..136935b7ae95 100644 --- a/pkgs/development/python-modules/pysensibo/default.nix +++ b/pkgs/development/python-modules/pysensibo/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pysensibo"; - version = "1.0.19"; + version = "1.0.20"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrey-git"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-pqg+NsdbSyXgC+4/AtbI4BZ5h2pMhvvBdQI9lHj6HME="; + hash = "sha256-L2NP4XS+dPlBr2h8tsGoa4G7tI9yiI4fwrhvQaKkexk="; }; propagatedBuildInputs = [ From 6e9b7bf66b920779657f7cc57fe939b1620a7797 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Sep 2022 05:39:24 +0000 Subject: [PATCH 033/176] python310Packages.pytest-httpserver: 1.0.5 -> 1.0.6 --- pkgs/development/python-modules/pytest-httpserver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytest-httpserver/default.nix b/pkgs/development/python-modules/pytest-httpserver/default.nix index 4b58c71cc656..cba9a9294e7c 100644 --- a/pkgs/development/python-modules/pytest-httpserver/default.nix +++ b/pkgs/development/python-modules/pytest-httpserver/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytest-httpserver"; - version = "1.0.5"; + version = "1.0.6"; src = fetchPypi { pname = "pytest_httpserver"; inherit version; - sha256 = "sha256-rjKWYm0KEOg1qfQjxhtFQFR9WCQivgVMP8wIYmuqECQ="; + sha256 = "sha256-kEDQe/WaxF2N49sdRGj9LR1geXXk2kyHLswEAs2/ez4="; }; propagatedBuildInputs = [ werkzeug ]; From e531229c4f42305c230fd911f4d49c00a8e72a0b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 14 Sep 2022 14:12:38 +0800 Subject: [PATCH 034/176] traefik: 2.8.4 -> 2.8.5 --- pkgs/servers/traefik/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/traefik/default.nix b/pkgs/servers/traefik/default.nix index f6c4cdaba046..9938a490ff5c 100644 --- a/pkgs/servers/traefik/default.nix +++ b/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.8.4"; + version = "2.8.5"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-TzNjz1usnQ0CMu47i9pnCRR6N/d3ig2E0wVH3E8xJp0="; + sha256 = "sha256-qRnt2ZyGMwnbilaau66/SEJOSWkKyZf1L7CLWVHme5k="; stripRoot = false; }; - vendorSha256 = "sha256-+jqMokDuvw5LTqBxJ/2VyoT3wkdBHewTrYsK/5Uv6js="; + vendorSha256 = "sha256-6gUnM+axlkzBwVx0OePTybPP1Fk+oqsFRED4+K9Weu4="; subPackages = [ "cmd/traefik" ]; From 332506870fae1099649dbda7e9638fd82aeaec2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Sep 2022 09:07:44 +0000 Subject: [PATCH 035/176] python310Packages.resampy: 0.4.1 -> 0.4.2 --- pkgs/development/python-modules/resampy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/resampy/default.nix b/pkgs/development/python-modules/resampy/default.nix index f5d59d0fecf2..190463f8f25e 100644 --- a/pkgs/development/python-modules/resampy/default.nix +++ b/pkgs/development/python-modules/resampy/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "resampy"; - version = "0.4.1"; + version = "0.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bmcfee"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-8qhYhkTtq7DwEvw+B4Ul4SMAPxweTgDIOtebmElkcsg="; + hash = "sha256-t5I7NJmIeV0uucPyvR+UJ24NK7fIzYlNJ8bECkbvdjI="; }; propagatedBuildInputs = [ From dfa09c70077826dc1bfe9f1d26ff6658df277288 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 14 Sep 2022 12:27:24 +0000 Subject: [PATCH 036/176] python310Packages.somajo: 2.2.1 -> 2.2.2 --- pkgs/development/python-modules/somajo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/somajo/default.nix b/pkgs/development/python-modules/somajo/default.nix index a03052c7e429..507e75356bed 100644 --- a/pkgs/development/python-modules/somajo/default.nix +++ b/pkgs/development/python-modules/somajo/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "somajo"; - version = "2.2.1"; + version = "2.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsproisl"; repo = "SoMaJo"; - rev = "v${version}"; - sha256 = "sha256-M0WtONhsqmmK0PBB+Df4YrFpT+vfVidDkt80eBHOo04="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-rzh+IASqs+uSgUq3BI9UdC4XRsozIGsaOt/LR+VhBxc="; }; propagatedBuildInputs = [ From 854cbbc3f4c2d4fc0cf66cc8716f78cddefb2364 Mon Sep 17 00:00:00 2001 From: firefly-cpp Date: Wed, 14 Sep 2022 14:33:46 +0200 Subject: [PATCH 037/176] python310Packages.niaarm: init at 0.2.0 --- .../python-modules/niaarm/default.nix | 50 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/python-modules/niaarm/default.nix diff --git a/pkgs/development/python-modules/niaarm/default.nix b/pkgs/development/python-modules/niaarm/default.nix new file mode 100644 index 000000000000..155fa2c78c0e --- /dev/null +++ b/pkgs/development/python-modules/niaarm/default.nix @@ -0,0 +1,50 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, niapy +, nltk +, pandas +, poetry-core +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "NiaARM"; + version = "0.2.0"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "firefly-cpp"; + repo = pname; + rev = version; + sha256 = "sha256-tO/9dDgPPL5fkFm/U9AhyydXW+dtem+Q3H2uKPAXzno="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + niapy + nltk + pandas + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "niaarm" + ]; + + meta = with lib; { + description = "A minimalistic framework for Numerical Association Rule Mining"; + homepage = "https://github.com/firefly-cpp/NiaARM"; + license = licenses.mit; + maintainers = with maintainers; [ firefly-cpp ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 65a387a1310c..ddb78c66b5ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6093,6 +6093,8 @@ in { enablePython = true; # ... and its Python bindings })).python; + niaarm = callPackage ../development/python-modules/niaarm { }; + niapy = callPackage ../development/python-modules/niapy { }; nibabel = callPackage ../development/python-modules/nibabel { }; From 8ec52e7f3ae52f2f6a380951dff985479f32c9fd Mon Sep 17 00:00:00 2001 From: mingchuan Date: Wed, 14 Sep 2022 08:34:52 -0700 Subject: [PATCH 038/176] krita: 5.1.0 -> 5.1.1 --- pkgs/applications/graphics/krita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 6a7edb460ecc..90d51827f14f 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "5.1.0"; + version = "5.1.1"; kde-channel = "stable"; - sha256 = "sha256-mjs/WFhIC3CRvUhEmSbmE1OOqKTcBiSchg/+PaWs2II="; + sha256 = "sha256-Tdv4l6+nsYcTFpfRKiO6OYlGOAaLLq4Ss7Q0/kKtjiQ="; }) From ea3037b773cf509f52c2f3d34e89514979009cff Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 02:25:32 +0000 Subject: [PATCH 039/176] circleci-cli: 0.1.21041 -> 0.1.21091 --- pkgs/development/tools/misc/circleci-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/circleci-cli/default.nix b/pkgs/development/tools/misc/circleci-cli/default.nix index fa73ef702d91..62653e360668 100644 --- a/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.21041"; + version = "0.1.21091"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dc1dFJJ5mBolnzSYbTqUsoex1MfyYOXlv07OvIgtvSQ="; + sha256 = "sha256-k8NeqGlhxYLZ4KAuX7eyCi5dIjYIx2z8Xb2JJb2H5Y0="; }; vendorSha256 = "sha256-jrAd1G/NCjXfaJmzOhMjMZfJoGHsQ1bi3HudBM0e8rE="; From 43333674a28c61217623316f0b82828352c9aecb Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 05:54:04 +0000 Subject: [PATCH 040/176] _1password: 2.7.0 -> 2.7.1 --- pkgs/applications/misc/1password/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/1password/default.nix b/pkgs/applications/misc/1password/default.nix index 8402e7147a66..d5b5c29c564f 100644 --- a/pkgs/applications/misc/1password/default.nix +++ b/pkgs/applications/misc/1password/default.nix @@ -12,12 +12,12 @@ let if extension == "zip" then fetchzip args else fetchurl args; pname = "1password-cli"; - version = "2.7.0"; + version = "2.7.1"; sources = rec { - aarch64-linux = fetch "linux_arm64" "sha256-6c8m+Gea52XpNrPtY7oi3gsALHwLiK5aD83rsJSp6x0=" "zip"; - i686-linux = fetch "linux_386" "sha256-glcyQ1JWP7/cMpMY2/tTLnhPXy8nVmbzvIw4ZmP8SKg=" "zip"; - x86_64-linux = fetch "linux_amd64" "sha256-CjHl3AzUaD7ESlXeFfreZgs5tc3C546GoEgkVJe+vv4=" "zip"; - aarch64-darwin = fetch "apple_universal" "sha256-3HEvkGWqJQNloVpkMl64DIoee3e/sMGf+GpAmAnS1jI=" "pkg"; + aarch64-linux = fetch "linux_arm64" "sha256-JEOvLga6o3QOPYyGJfvqWIYL00TaqjcFzSMKw1ZSxtM=" "zip"; + i686-linux = fetch "linux_386" "sha256-Xd40mOsElbrGioPX0irz13jhiu8mZ2n6LmKrt4FyzDg=" "zip"; + x86_64-linux = fetch "linux_amd64" "sha256-DZYSkgrIpH0cYpIllVWHIuUcNgNyeX09dZ1RgUudWP8=" "zip"; + aarch64-darwin = fetch "apple_universal" "sha256-j+e9y1FQp30O5pFVLbbXhtrbyRjWZZPFhkFfNXDcCPs=" "pkg"; x86_64-darwin = aarch64-darwin; }; platforms = builtins.attrNames sources; From de927976736688fe37b1f9fba3b395b38cc85e28 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 06:59:52 +0000 Subject: [PATCH 041/176] btrfs-progs: 5.19 -> 5.19.1 --- pkgs/tools/filesystems/btrfs-progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index 4dcf1a7a56ce..608c318b10a6 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -10,11 +10,11 @@ stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.19"; + version = "5.19.1"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-H7zwbksvgOehJ/1oftRiWlt0+mdP4hLINv9w4O38zPk="; + sha256 = "sha256-JkKeVANDzMf11LP49CuRZxMoDomMVHHacFAm720sEKY="; }; nativeBuildInputs = [ From 0df07a3038b2677dd254fbd39bbe182df4e384fa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 08:11:03 +0000 Subject: [PATCH 042/176] elfx86exts: 0.4.3 -> 0.5.0 --- pkgs/applications/misc/elfx86exts/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/elfx86exts/default.nix b/pkgs/applications/misc/elfx86exts/default.nix index 91598db76d01..237b9708a9bb 100644 --- a/pkgs/applications/misc/elfx86exts/default.nix +++ b/pkgs/applications/misc/elfx86exts/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "elfx86exts"; - version = "0.4.3"; + version = "0.5.0"; src = fetchFromGitHub { owner = "pkgw"; repo = pname; rev = "${pname}@${version}"; - sha256 = "1j9ca2lyxjsrf0rsfv83xi53vj6jz5nb76xibh367brcsc26mvd6"; + sha256 = "sha256-SDBs5/jEvoKEVKCHQLz2z+CZSSmESP7LoIITRN4qJWA="; }; - cargoSha256 = "0n3b9vdk5n32jmd7ks50d55z4dfahjincd2s1d8m9z17ip2qw2c4"; + cargoSha256 = "sha256-fYtFRdH6U8uWshdD1Pb1baE8slo6qajx10tDK3Ukknw="; meta = with lib; { description = "Decode x86 binaries and print out which instruction set extensions they use."; From b378e2e6c0ae06cf170520175edcbe29471bf916 Mon Sep 17 00:00:00 2001 From: grindhold Date: Thu, 15 Sep 2022 10:33:49 +0200 Subject: [PATCH 043/176] =?UTF-8?q?libgtkflow:=200.8.0=20=E2=86=92=200.10.?= =?UTF-8?q?0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/libraries/libgtkflow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgtkflow/default.nix b/pkgs/development/libraries/libgtkflow/default.nix index 3e08f0dee772..78e43d56b9a4 100644 --- a/pkgs/development/libraries/libgtkflow/default.nix +++ b/pkgs/development/libraries/libgtkflow/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "libgtkflow"; - version = "0.8.0"; + version = "0.10.0"; src = fetchFromGitea { domain = "notabug.org"; owner = "grindhold"; repo = pname; rev = version; - hash = "sha256:1m30rvj5hx3b4cj8lbzrxv4j8lp3hx4jlb8vpf4rh46vc1rdkxpz"; + hash = "sha256-iTOoga94yjGTowQOM/EvHEDOO9Z3UutPGRgEoI1UWkI="; }; nativeBuildInputs = [ From bbf54bb3246609ed47a254e8a3adec3f40b23680 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 09:45:19 +0000 Subject: [PATCH 044/176] flyway: 9.2.2 -> 9.3.0 --- pkgs/development/tools/flyway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 0208235de3ae..fa4d9c94489d 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,10 +1,10 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: stdenv.mkDerivation rec{ pname = "flyway"; - version = "9.2.2"; + version = "9.3.0"; src = fetchurl { url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-aHsBey1WzmRhcrCeHeAeVuEvX4iaxbIb/C7N6tCOyuY="; + sha256 = "sha256-OnJu6gMznpzArm6KRf9ggnY+287tvrdddf9OvE5R9a8="; }; nativeBuildInputs = [ makeWrapper ]; dontBuild = true; From 1624df09198399f30fdf18e146f4db74dacb2c91 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 15 Sep 2022 09:54:56 -0400 Subject: [PATCH 045/176] miniserve: 0.20.0 -> 0.21.0 --- pkgs/tools/misc/miniserve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/miniserve/default.nix b/pkgs/tools/misc/miniserve/default.nix index 2b410f9c3bb1..3d4cccbb18ec 100644 --- a/pkgs/tools/misc/miniserve/default.nix +++ b/pkgs/tools/misc/miniserve/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - hash = "sha256-56XP8e05rdslkrjmHRuYszqcBFZ7xCuj74mfGS9jznQ="; + hash = "sha256-tps/TKkG2To80zokNoSHQQPrzZnoS+lBWks/PIV586Q="; }; - cargoSha256 = "sha256-NZ2/N09LFAvXFGpJj4kx7jpt1G6akXsrVe6XqQPCN9g="; + cargoSha256 = "sha256-9xRxUnDEji5+3drHQtdK1ozW8nezushxZZAaUlp+jJQ="; nativeBuildInputs = [ installShellFiles From 55635cc075e0e35e1b0b2d9c8c3b2d4f98fa3429 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 14:21:41 +0000 Subject: [PATCH 046/176] bazel-gazelle: 0.26.0 -> 0.27.0 --- pkgs/development/tools/bazel-gazelle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index 1c57aff18a8a..6d94b768d09f 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-f+4XeH282VbasY6ShSNLsesn1OR8wb6kePU808UQWpw="; + sha256 = "sha256-V3XNh2Npxt941wvLICMGmEBsji/TNoDkWBC27EjLsKY="; }; vendorSha256 = null; From c52f62857ae18b232f01ea0f396474b6303e2e11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 16:03:07 +0000 Subject: [PATCH 047/176] ecs-agent: 1.63.0 -> 1.63.1 --- pkgs/applications/virtualization/ecs-agent/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/ecs-agent/default.nix b/pkgs/applications/virtualization/ecs-agent/default.nix index ec5ad0f0c000..da77aaca0f25 100644 --- a/pkgs/applications/virtualization/ecs-agent/default.nix +++ b/pkgs/applications/virtualization/ecs-agent/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "amazon-ecs-agent"; - version = "1.63.0"; + version = "1.63.1"; goPackagePath = "github.com/aws/${pname}"; subPackages = [ "agent" ]; @@ -11,7 +11,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "aws"; repo = pname; - sha256 = "sha256-SDDfwFnnoq2fCeg+wfJsczXb4dDChgyfsNrZkwGMHCc="; + sha256 = "sha256-wnDwLpCDeIC2D2X/pzC6ZsudJz58xLo1PQB+K6WNxBE="; }; meta = with lib; { From 99a832011fe5159ea3b1f57598bb185be8dfff26 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 17:13:21 +0000 Subject: [PATCH 048/176] flow: 0.186.0 -> 0.187.0 --- pkgs/development/tools/analysis/flow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix index 3d86d0294e1f..b6107037434a 100644 --- a/pkgs/development/tools/analysis/flow/default.nix +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "flow"; - version = "0.186.0"; + version = "0.187.0"; src = fetchFromGitHub { owner = "facebook"; repo = "flow"; rev = "v${version}"; - sha256 = "sha256-Bip56IgE+XtNSwUC09ANe9ClSg6vTQO60spt1ijvs68="; + sha256 = "sha256-G+Le/LtmO/kdA/0IDcmEoacCLhKg7sSRBxEsYQXAK1w="; }; makeFlags = [ "FLOW_RELEASE=1" ]; From e78ad2c8484b9f58b271ad918f3e827a2672d2c5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:54:22 -0300 Subject: [PATCH 049/176] linux: 4.14.292 -> 4.14.293 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 71eaa0b5c23e..6aa7ede3f5fa 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.292"; + version = "4.14.293"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0zc97qy62dhc5xkjnvsfn4lpl4dgrj23hlxvxcr4cr8sj0hxzx3h"; + sha256 = "047gl9nqrvpi9jaxlmhfnx848qvnrhf13710ka8fwn3lyv22k342"; }; } // (args.argsOverride or {})) From d233f0c847548b68e4d654af6205183c78913973 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:54:32 -0300 Subject: [PATCH 050/176] linux: 4.19.257 -> 4.19.258 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 8dac0b120a9c..b05e16e9832f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.257"; + version = "4.19.258"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0izaldl2l2zsshkd07qsnr9x6ikipmj5jp7lxr8dyz7kf2m17pga"; + sha256 = "002sw8b272dzkp3vff0x89sbj5p3vrrikqygfdgrsxv7k3w4459x"; }; } // (args.argsOverride or {})) From ba9e102d7920f15a243edc4d69fcb374d2540f14 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:54:40 -0300 Subject: [PATCH 051/176] linux: 4.9.327 -> 4.9.328 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index c435a82c50dd..38c7106dfa6f 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,12 +1,12 @@ { buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args: buildLinux (args // rec { - version = "4.9.327"; + version = "4.9.328"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1lh63viynf9f7vl0a52mnal8jack9lbqfsfammwkxi3kafpw30r2"; + sha256 = "1px2np3k796cjwq1sp9gfxyql6hqyqya82vq9cb5y0canq6fqmg8"; }; } // (args.argsOverride or {})) From 287558445808c4f7c8b3488e66dc0ca5c7310e58 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:54:50 -0300 Subject: [PATCH 052/176] linux: 5.10.142 -> 5.10.143 --- pkgs/os-specific/linux/kernel/linux-5.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.10.nix b/pkgs/os-specific/linux/kernel/linux-5.10.nix index f17beabecd62..34bea203c4e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.142"; + version = "5.10.143"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0s52vfvw5pgnq7gq9n66ib05ryhkxwv765f16862l5gykbdynirz"; + sha256 = "14af0lsvgh1k0fh283d0nrm1pkrk2kaf2mz0ab59vlvjybg9wb7s"; }; } // (args.argsOverride or {})) From 087dde20ebb0318bdfcbacdfc2df301f76bcc6af Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:55:02 -0300 Subject: [PATCH 053/176] linux: 5.15.67 -> 5.15.68 --- pkgs/os-specific/linux/kernel/linux-5.15.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.15.nix b/pkgs/os-specific/linux/kernel/linux-5.15.nix index 9b98bb0e4cd0..aa18ff18fd87 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.67"; + version = "5.15.68"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0h7r2k59jsw8ykb2p7nxrpazbwx1n5p3nmfbbj1lhib91fldjiys"; + sha256 = "0zlb44bwpc0hwfynzz5v5b3lkv4aha7w5737ns1qb8cvbk5v7fqp"; }; } // (args.argsOverride or { })) From 9f80f6bfa96d82a49314f9de3c4552439ce6df75 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:55:13 -0300 Subject: [PATCH 054/176] linux: 5.19.8 -> 5.19.9 --- pkgs/os-specific/linux/kernel/linux-5.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.19.nix b/pkgs/os-specific/linux/kernel/linux-5.19.nix index a6fb0aa1f583..422afc2e5452 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.19.8"; + version = "5.19.9"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1kl7fifsa6vsm34xg3kd2svhx18n771hfj67nhwnlalmb9whhqv1"; + sha256 = "0dvzjbyknzlx4ndz77fsm6v28fj2chxbq1z85fbc3bckcscbbm8a"; }; } // (args.argsOverride or { })) From 18a8634d15142ee2f8ed27b2961ff543aeb4a7a2 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:55:22 -0300 Subject: [PATCH 055/176] linux: 5.4.212 -> 5.4.213 --- pkgs/os-specific/linux/kernel/linux-5.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.4.nix b/pkgs/os-specific/linux/kernel/linux-5.4.nix index f341bc77d438..09ac4bf32739 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.212"; + version = "5.4.213"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1hngr4hsrcd6hmlyvc3msy5racniav2jagp5abmp7xsxv0yjxiq9"; + sha256 = "1wdssqmac66zqsnq5lx2z8ampa0rd3qswg0gm1sh6n3y8xlf2z76"; }; } // (args.argsOverride or {})) From 558d9998a7edfc86c740517f6ddbd31b10ac7ff6 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Thu, 15 Sep 2022 14:55:50 -0300 Subject: [PATCH 056/176] linux_latest-libre: 18904 -> 18911 --- pkgs/os-specific/linux/kernel/linux-libre.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-libre.nix b/pkgs/os-specific/linux/kernel/linux-libre.nix index 6de38abd07f7..f760c033683d 100644 --- a/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "18904"; - sha256 = "1l200abijg5y15h4vza86sirlcplm7iyhm3igdyxqj3s0169nck9"; + rev = "18911"; + sha256 = "1f5b936a7ayva2kyly3n71sg6cqdvcavcxbj3cy3imaj9247bx72"; } , ... }: From e201179a17ab67bae9427506f4400eac883891a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristoffer=20K=2E=20F=C3=B8llesdal?= Date: Thu, 15 Sep 2022 19:50:39 +0200 Subject: [PATCH 057/176] python3Packages.prometheus-flask-exporter: 0.18.1 -> 0.20.3 --- .../python-modules/prometheus-flask-exporter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index 7abb9670ac8a..09891d0d4bbb 100644 --- a/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "prometheus-flask-exporter"; - version = "0.18.1"; + version = "0.20.3"; src = fetchFromGitHub { owner = "rycus86"; repo = "prometheus_flask_exporter"; rev = version; - sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; + sha256 = "sha256-l9Iw9fvXQMXzq1y/4Dml8uLPJWyqX6SDIXptJVw3cVQ="; }; propagatedBuildInputs = [ flask prometheus-client ]; From 2b98185b4465d134e8c2554a88b716f38f2f43ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 15 Sep 2022 17:37:53 -0300 Subject: [PATCH 058/176] enlightenment.enlightenment: 0.25.3 -> 0.25.4 --- pkgs/desktops/enlightenment/enlightenment/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/enlightenment/enlightenment/default.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix index 3ce2592598f5..52c4a0719d03 100644 --- a/pkgs/desktops/enlightenment/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/enlightenment/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchurl , meson , ninja @@ -21,11 +22,11 @@ stdenv.mkDerivation rec { pname = "enlightenment"; - version = "0.25.3"; + version = "0.25.4"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1xngwixp0cckfq3jhrdmmk6zj67125amr7g6xwc6l89pnpmlkz9p"; + sha256 = "sha256-VttdIGuCG5qIMdJucT5BCscLIlWm9D/N98Ae794jt6I="; }; nativeBuildInputs = [ From 7526a80fdf817eb396ac1ffefa4eda50051c893c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 02:13:53 +0000 Subject: [PATCH 059/176] pspg: 5.5.6 -> 5.5.7 --- pkgs/tools/misc/pspg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pspg/default.nix b/pkgs/tools/misc/pspg/default.nix index abba7ca91ac3..d10b30e98181 100644 --- a/pkgs/tools/misc/pspg/default.nix +++ b/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "5.5.6"; + version = "5.5.7"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "sha256-99EuWSNW9e5/GyiR3JwDNFTAOJpaGCJKmxt340bjPrA="; + sha256 = "sha256-kg3jV3TNG80oviy25U2tmShBACfpXDr4zuc/FD2E/Xo="; }; nativeBuildInputs = [ pkg-config installShellFiles ]; From eb168b9077efdb6cfed060ab3d267f9af941d246 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 03:36:51 +0000 Subject: [PATCH 060/176] sensu-go-agent: 6.8.0 -> 6.8.1 --- pkgs/servers/monitoring/sensu-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/sensu-go/default.nix b/pkgs/servers/monitoring/sensu-go/default.nix index 76c56f4a4c1e..c9661c79c0ea 100644 --- a/pkgs/servers/monitoring/sensu-go/default.nix +++ b/pkgs/servers/monitoring/sensu-go/default.nix @@ -4,19 +4,19 @@ let generic = { subPackages, pname, postInstall ? "", mainProgram }: buildGoModule rec { inherit pname; - version = "6.8.0"; + version = "6.8.1"; shortRev = "3a1ac58"; # for internal version info src = fetchFromGitHub { owner = "sensu"; repo = "sensu-go"; rev = "v${version}"; - sha256 = "sha256-T9SR3Ec7Q51Q2L/xJHx35eA0/KcFB3ZxqimIYKwAJLU="; + sha256 = "sha256-6kyT5atO9hqmrQnjhoLPDJEMueKYXawVvhxKMTEPJ6k="; }; inherit subPackages postInstall; - vendorSha256 = "sha256-Y8gYh770p22O1ZLcqZi5NNKWOP4sXHSP3b0d4klrSHg="; + vendorSha256 = "sha256-yysRmhVUw1cYgYhWg74dv3+nmLBDx5ZiXuCba1e/CrI="; doCheck = false; From 3c1d900e896a483a8c14e37510a308d589dbb70b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 03:53:23 +0000 Subject: [PATCH 061/176] slides: 0.8.0 -> 0.9.0 --- pkgs/applications/misc/slides/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/slides/default.nix b/pkgs/applications/misc/slides/default.nix index aaac0c106577..cedd87017313 100644 --- a/pkgs/applications/misc/slides/default.nix +++ b/pkgs/applications/misc/slides/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "slides"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "sha256-Ca0/M4B6yAdV4hbJ95gH9MVZg3EFIY5bSMkkYy2+P+Q="; + sha256 = "sha256-K8VsqaNUPxh3/Yddy6DFiOyjRuZ6r6bU456Pm31A1og="; }; checkInputs = [ @@ -21,7 +21,7 @@ buildGoModule rec { go ]; - vendorSha256 = "sha256-pn7c/6RF/GpECQtaxsTau91T7pLg+ZAUBbnR7h8DfnY="; + vendorSha256 = "sha256-c3YCf22L5+rTmH5ePeJ0/goRj5rKY6v+Zon3183MhMY="; ldflags = [ "-s" From e3f966c2bf72e4544764e7c7a268940e8c5f584e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 04:08:48 +0000 Subject: [PATCH 062/176] python310Packages.furo: 2022.6.21 -> 2022.9.15 --- pkgs/development/python-modules/furo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index cd97c2b5697c..5378a1e9739b 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "furo"; - version = "2022.6.21"; + version = "2022.9.15"; format = "wheel"; disable = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-Bhto4yM0Xif8ugJM8zoed/Pf2NmYdBC+gidJpwbirdY="; + sha256 = "sha256-kSnerR916ftPpAdhLx1aDQMgdn5hVsklqv4282L5sRo="; }; propagatedBuildInputs = [ From 984aa72e0fa3da8b107daf9169730077815bfe04 Mon Sep 17 00:00:00 2001 From: Mostly Void Date: Fri, 16 Sep 2022 11:20:23 +0530 Subject: [PATCH 063/176] Apply suggestions from code review Co-authored-by: Anderson Torres --- pkgs/servers/nosql/immudb/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/nosql/immudb/default.nix b/pkgs/servers/nosql/immudb/default.nix index 95a8299ddaf3..a2f56f4f45c9 100644 --- a/pkgs/servers/nosql/immudb/default.nix +++ b/pkgs/servers/nosql/immudb/default.nix @@ -11,7 +11,6 @@ let url = "https://github.com/codenotary/immudb-webconsole/releases/download/v${webconsoleVersion}/immudb-webconsole.tar.gz"; sha256 = "sha256-hFSvPwSRXyrSBYktTOwIRa1+aH+mX/scDYDokvZuW1s="; }; - in buildGoModule rec { pname = "immudb"; @@ -47,14 +46,14 @@ buildGoModule rec { ]; postInstall = '' - mkdir -p share/completions - for executable in immudb immuclient immuadmin; do - for shell in bash fish zsh; do - $out/bin/$executable completion $shell > share/completions/$executable.$shell - installShellCompletion share/completions/$executable.$shell - done - done - ''; + mkdir -p share/completions + for executable in immudb immuclient immuadmin; do + for shell in bash fish zsh; do + $out/bin/$executable completion $shell > share/completions/$executable.$shell + installShellCompletion share/completions/$executable.$shell + done + done + ''; meta = with lib; { description = "Immutable database based on zero trust, SQL and Key-Value, tamperproof, data change history"; From 69756638f568509b2bb7baead1541c18bb2a4ebe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 07:56:57 +0000 Subject: [PATCH 064/176] cargo-udeps: 0.1.32 -> 0.1.33 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index d54e46adc5e0..bb512e0eeff5 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.32"; + version = "0.1.33"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ev7hLtE5/PqeM39nyWaMyIhFsEZnXbdyU8Q5PET98lQ="; + sha256 = "sha256-Fl/4RsWHjWYJ76mD59m9Gcs2hz7bwnd0YWpZnVgMKjg="; }; - cargoSha256 = "sha256-3+6hZCYiyG6fgyJpjCcY1dzDK0kwVjsyckPIq/8Zfm0="; + cargoSha256 = "sha256-kQwg1R+rvg2Tw27pTkrOi5QpPF3Q1woPsjac9RDYCyg="; nativeBuildInputs = [ pkg-config ]; From 6d35c1559ac647d758a9011715efc2fd72de2e10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 08:46:21 +0000 Subject: [PATCH 065/176] deno: 1.25.2 -> 1.25.3 --- pkgs/development/web/deno/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/web/deno/default.nix b/pkgs/development/web/deno/default.nix index 185065d1a56f..2792f7326147 100644 --- a/pkgs/development/web/deno/default.nix +++ b/pkgs/development/web/deno/default.nix @@ -17,15 +17,15 @@ rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.25.2"; + version = "1.25.3"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yi4isp5VuQnLq2KYyti6czlVhycmxOs0a9G6rzkCgqo="; + sha256 = "sha256-bKZ9/3f9YN24hV+U3d4PDKHMvNyD72qJpfqfAmgO0dk="; }; - cargoSha256 = "sha256-fHOTL8qipOOjI91a73wMXUm0tD78O1eHhCAtRyClmWc="; + cargoSha256 = "sha256-Y/19wrY26rDuA6Pwlr2gjl1JupaJwaOhY0msq6nIyYc="; postPatch = '' # upstream uses lld on aarch64-darwin for faster builds From 92112872cd8bd0aeaf02ae241bfc26717d260081 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 09:28:28 +0000 Subject: [PATCH 066/176] xonsh: 0.13.1 -> 0.13.3 --- pkgs/shells/xonsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index 6c7132b46c91..db9469cb7fd0 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -8,14 +8,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.13.1"; + version = "0.13.3"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "xonsh"; repo = "xonsh"; - rev = version; - sha256 = "sha256-Q9FJXccpTW3nPUOCf5UD8ZWJW25QX8PNHHpsVYjesYE="; + rev = "refs/tags/${version}"; + sha256 = "sha256-COm+MZUbiFTB5EaOB+1+lIef1IfhQ95Ya1MmnJXGu6A="; }; LC_ALL = "en_US.UTF-8"; From 46744932370efdd87648c44bbfbcf72049c8d96d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 09:30:48 +0000 Subject: [PATCH 067/176] go-ethereum: 1.10.23 -> 1.10.25 --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index fa1aca4360f2..ca8f33bcd5c5 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,13 +9,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.23"; + version = "1.10.25"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-1fEmtbHKrjuyIVrGr/vTudZ99onkNjEMvyBJt4I8KK4="; + sha256 = "sha256-mnf0kMfQEEQMricZJfyF7ZB/2F1dyPBx9iT2v/rGh1U="; }; vendorSha256 = "sha256-Dj+xN8lr98LJyYr2FwJ7yUIJkUeUrr1fkcbj4hShJI0="; @@ -46,7 +46,7 @@ in buildGoModule rec { "cmd/utils" ]; - # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.23/build/ci.go#L218 + # Following upstream: https://github.com/ethereum/go-ethereum/blob/v1.10.25/build/ci.go#L218 tags = [ "urfave_cli_no_docs" ]; # Fix for usb-related segmentation faults on darwin From 0016b767455857295159e94a2e0d597ae0dcce87 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 16 Sep 2022 17:39:20 +0800 Subject: [PATCH 068/176] nsjail: 3.0 -> 3.1 --- .../nsjail/001-fix-bison-link-error.patch | 30 ------------------- pkgs/tools/security/nsjail/default.nix | 18 ++++------- 2 files changed, 6 insertions(+), 42 deletions(-) delete mode 100644 pkgs/tools/security/nsjail/001-fix-bison-link-error.patch diff --git a/pkgs/tools/security/nsjail/001-fix-bison-link-error.patch b/pkgs/tools/security/nsjail/001-fix-bison-link-error.patch deleted file mode 100644 index 427cea5b02b6..000000000000 --- a/pkgs/tools/security/nsjail/001-fix-bison-link-error.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 8e309a0af0851ab54ca7c6d51b6f3d19ee42c8ee Mon Sep 17 00:00:00 2001 -From: Evangelos Foutras -Date: Wed, 17 Mar 2021 16:36:40 +0200 -Subject: [PATCH] Replace YYUSE call with void cast in src/parser.y - -The YYUSE macro was renamed to YY_USE in bison 3.7.5; we might as well -avoid using it altogether and cast the unused variable to void instead. - -Fixes the following linker error: - -/usr/bin/ld: kafel/libkafel.a(libkafel.o): in function `kafel_yyerror': -arm_syscalls.c:(.text+0x6984): undefined reference to `YYUSE' ---- - src/parser.y | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/parser.y b/src/parser.y -index e0f109c..0e01373 100644 ---- a/kafel/src/parser.y -+++ b/kafel/src/parser.y -@@ -420,8 +420,8 @@ const_def - - void yyerror(YYLTYPE * loc, struct kafel_ctxt* ctxt, yyscan_t scanner, - const char *msg) { -+ (void)scanner; /* suppress unused-parameter warning */ - if (!ctxt->lexical_error) { -- YYUSE(scanner); - if (loc->filename != NULL) { - append_error(ctxt, "%s:%d:%d: %s", loc->filename, loc->first_line, loc->first_column, msg); - } else { diff --git a/pkgs/tools/security/nsjail/default.nix b/pkgs/tools/security/nsjail/default.nix index 568113368a08..c86fcb7ace57 100644 --- a/pkgs/tools/security/nsjail/default.nix +++ b/pkgs/tools/security/nsjail/default.nix @@ -1,36 +1,30 @@ { lib, stdenv, fetchFromGitHub, autoconf, bison, flex, libtool, pkg-config, which -, libnl, protobuf, protobufc, shadow +, libnl, protobuf, protobufc, shadow, installShellFiles }: stdenv.mkDerivation rec { pname = "nsjail"; - version = "3.0"; # Bumping? Remove the bison patch. + version = "3.1"; src = fetchFromGitHub { owner = "google"; repo = "nsjail"; rev = version; fetchSubmodules = true; - sha256 = "1w6x8xcrs0i1y3q41gyq8z3cq9x24qablklc4jiydf855lhqn4dh"; + sha256 = "sha256-ICJpD7iCT7tLRX+52XvayOUuO1g0L0jQgk60S2zLz6c="; }; - nativeBuildInputs = [ autoconf bison flex libtool pkg-config which ]; + nativeBuildInputs = [ autoconf bison flex libtool pkg-config which installShellFiles ]; buildInputs = [ libnl protobuf protobufc ]; enableParallelBuilding = true; - patches = [ - # To remove after bumping 3.0 - ./001-fix-bison-link-error.patch - ]; - preBuild = '' makeFlagsArray+=(USER_DEFINES='-DNEWUIDMAP_PATH=${shadow}/bin/newuidmap -DNEWGIDMAP_PATH=${shadow}/bin/newgidmap') ''; installPhase = '' - mkdir -p $out/bin $out/share/man/man1 - install nsjail $out/bin/ - install nsjail.1 $out/share/man/man1/ + install -Dm755 nsjail "$out/bin/nsjail" + installManPage nsjail.1 ''; meta = with lib; { From cccc3b53f40b6662682d7d4d1a85ab7989143250 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 16 Sep 2022 13:29:18 +0200 Subject: [PATCH 069/176] =?UTF-8?q?why3:=201.5.0=20=E2=86=92=201.5.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/science/logic/why3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/why3/default.nix b/pkgs/applications/science/logic/why3/default.nix index ab5006e424e1..11cd19188965 100644 --- a/pkgs/applications/science/logic/why3/default.nix +++ b/pkgs/applications/science/logic/why3/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "why3"; - version = "1.5.0"; + version = "1.5.1"; src = fetchurl { url = "https://why3.gitlabpages.inria.fr/releases/${pname}-${version}.tar.gz"; - sha256 = "sha256:0qjh49pyqmg3xi09fn4lyzz23i6h18y9sgc8ayscvx3bwr3vcqhr"; + sha256 = "sha256-vNR7WeiSvg+763GcovoZBFDfncekJMeqNegP4fVw06I="; }; buildInputs = with ocamlPackages; [ From ca89fa40f6a4f93186f01c1746652f5ed2c5b357 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 12:01:24 +0000 Subject: [PATCH 070/176] dalfox: 2.7.5 -> 2.8.1 --- pkgs/tools/security/dalfox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/dalfox/default.nix b/pkgs/tools/security/dalfox/default.nix index 84eccdad312f..5bdc036323b8 100644 --- a/pkgs/tools/security/dalfox/default.nix +++ b/pkgs/tools/security/dalfox/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "dalfox"; - version = "2.7.5"; + version = "2.8.1"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MCKXhDhpFLZTf0CYS3W4+4FykTuBu7q3Dy+R7RNp11s="; + sha256 = "sha256-JNEKFbhJlBUvAzqd1UODWv8HIo5LDVPvFfwmztsRW2o="; }; - vendorSha256 = "sha256-GW2DgfHEKKWBfW5A7DYqhV2jP3FLDjzpYOMWSTNCN0Q="; + vendorSha256 = "sha256-PVtUC8UfUBGL7m1SsMK48Bcm9poCSFcPWJs1e+/UfSI="; meta = with lib; { description = "Tool for analysing parameter and XSS scanning"; From eac8053674190e0206272ee3c7c0d54990c1a749 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Fri, 16 Sep 2022 10:18:51 -0300 Subject: [PATCH 071/176] xfce.xfce4-pulseaudio-plugin: 0.4.4 -> 0.4.5 - Update to version 0.4.5 - Unused dbus-glib include has been removed in version 0.4.3 --- .../panel-plugins/xfce4-pulseaudio-plugin/default.nix | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix index 7591ed1e0e5c..320eb9280526 100644 --- a/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix +++ b/pkgs/desktops/xfce/panel-plugins/xfce4-pulseaudio-plugin/default.nix @@ -1,8 +1,6 @@ { lib , mkXfceDerivation , automakeAddFlags -, dbus-glib -, dbus , exo , gtk3 , libpulseaudio @@ -18,15 +16,13 @@ mkXfceDerivation { category = "panel-plugins"; pname = "xfce4-pulseaudio-plugin"; - version = "0.4.4"; - sha256 = "sha256-arnHB9ziQm/vQk6hYHS+MKL5dJeEVxUX+SwjZ3/LcEQ="; + version = "0.4.5"; + sha256 = "sha256-oRkvKSDEEepNwWIMDYLH/a034xxFhhOx+vp8O2UfTos="; nativeBuildInputs = [ automakeAddFlags ]; - NIX_CFLAGS_COMPILE = "-I${dbus-glib.dev}/include/dbus-1.0 -I${dbus.dev}/include/dbus-1.0"; - postPatch = '' substituteInPlace configure.ac.in --replace gio-2.0 gio-unix-2.0 ''; From d5e5f99a880af93f37e524aeb90d39d291a8df95 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 16 Sep 2022 22:09:51 +0800 Subject: [PATCH 072/176] python3Packages.hs-dbus-signature: add pythonImportsCheck --- pkgs/development/python-modules/hs-dbus-signature/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/hs-dbus-signature/default.nix b/pkgs/development/python-modules/hs-dbus-signature/default.nix index 7d071b75c3b1..657a1d8b24a6 100644 --- a/pkgs/development/python-modules/hs-dbus-signature/default.nix +++ b/pkgs/development/python-modules/hs-dbus-signature/default.nix @@ -19,6 +19,8 @@ buildPythonPackage rec { hypothesis ]; + pythonImportsCheck = [ "hs_dbus_signature" ]; + meta = with lib; { description = "A Hypothesis Strategy for Generating Arbitrary DBus Signatures"; homepage = "https://github.com/stratis-storage/hs-dbus-signature"; From 7e213e5510d2f300dd73168f9a3acf4393832115 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 16 Sep 2022 22:11:19 +0800 Subject: [PATCH 073/176] python3Packages.dbus-signature-pyparsing: add pythonImportsCheck --- .../python-modules/dbus-signature-pyparsing/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix index 659fcc3ed59d..8b0eb3f3cf97 100644 --- a/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix +++ b/pkgs/development/python-modules/dbus-signature-pyparsing/default.nix @@ -25,6 +25,8 @@ buildPythonPackage rec { hs-dbus-signature ]; + pythonImportsCheck = [ "dbus_signature_pyparsing" ]; + meta = with lib; { description = "A Parser for a D-Bus Signature"; homepage = "https://github.com/stratis-storage/dbus-signature-pyparsing"; From 5d5be01eb27972f070a513c0131b779500c4569b Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 16 Sep 2022 22:12:45 +0800 Subject: [PATCH 074/176] python3Packages.into-dbus-python: add pythonImportsCheck --- pkgs/development/python-modules/into-dbus-python/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/into-dbus-python/default.nix b/pkgs/development/python-modules/into-dbus-python/default.nix index 1d893cd69692..5ef92cf216a5 100644 --- a/pkgs/development/python-modules/into-dbus-python/default.nix +++ b/pkgs/development/python-modules/into-dbus-python/default.nix @@ -23,12 +23,15 @@ buildPythonPackage rec { dbus-signature-pyparsing dbus-python ]; + checkInputs = [ pytestCheckHook hypothesis hs-dbus-signature ]; + pythonImportsCheck = [ "into_dbus_python" ]; + meta = with lib; { description = "A transformer to dbus-python types"; homepage = "https://github.com/stratis-storage/into-dbus-python"; From 207e9aa1b38f8d7d71bd2a451d689448ba09273e Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 16 Sep 2022 22:13:53 +0800 Subject: [PATCH 075/176] python3Packages.dbus-python-client-gen: add pythonImportsCheck --- .../python-modules/dbus-python-client-gen/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/python-modules/dbus-python-client-gen/default.nix b/pkgs/development/python-modules/dbus-python-client-gen/default.nix index 100144c152e4..02b973d145ce 100644 --- a/pkgs/development/python-modules/dbus-python-client-gen/default.nix +++ b/pkgs/development/python-modules/dbus-python-client-gen/default.nix @@ -21,10 +21,13 @@ buildPythonPackage rec { into-dbus-python dbus-python ]; + checkInputs = [ pytestCheckHook ]; + pythonImportsCheck = [ "dbus_python_client_gen" ]; + meta = with lib; { description = "A Python library for generating dbus-python client code"; homepage = "https://github.com/stratis-storage/dbus-python-client-gen"; From 0fa2f2148b05574bc860aaeea49c42f904e8423a Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 16 Sep 2022 22:28:13 +0800 Subject: [PATCH 076/176] stratis-cli: add pytestCheckHook and pythonImportsCheck --- pkgs/tools/filesystems/stratis-cli/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/tools/filesystems/stratis-cli/default.nix b/pkgs/tools/filesystems/stratis-cli/default.nix index 813ecfa22c6d..145d570b6a8c 100644 --- a/pkgs/tools/filesystems/stratis-cli/default.nix +++ b/pkgs/tools/filesystems/stratis-cli/default.nix @@ -25,6 +25,18 @@ python3Packages.buildPythonApplication rec { packaging ]; + checkInputs = with python3Packages; [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # tests below require dbus daemon + "tests/whitebox/integration" + "tests/whitebox/monkey_patching" + ]; + + pythonImportsCheck = [ "stratis_cli" ]; + passthru.tests = nixosTests.stratis; meta = with lib; { From daf63002c1df2dcc768ba442b9fb26e655b158c2 Mon Sep 17 00:00:00 2001 From: Alex Martens Date: Fri, 16 Sep 2022 07:28:44 -0700 Subject: [PATCH 077/176] cargo-spellcheck: 0.12.1 -> 0.12.2 --- pkgs/development/tools/rust/cargo-spellcheck/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-spellcheck/default.nix b/pkgs/development/tools/rust/cargo-spellcheck/default.nix index fd97d798c144..585833ef4696 100644 --- a/pkgs/development/tools/rust/cargo-spellcheck/default.nix +++ b/pkgs/development/tools/rust/cargo-spellcheck/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-spellcheck"; - version = "0.12.1"; + version = "0.12.2"; src = fetchFromGitHub { owner = "drahnr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PyNO+kBxTYeqXgZh1XhE18G9ZK7suo/acKSE57zCbcY="; + sha256 = "sha256-8HZBenv2bL6D8TXzjklEFUAnqk7LkYXjtEwxpTbbzr4="; }; - cargoSha256 = "sha256-i6AvKF34Gh3QhwvYVd+QTYCPMW9D0/vhz7WoY5d4kHU="; + cargoSha256 = "sha256-zCk+b7jcR7yDpBUVfKXIozQkcsB+73HosdCmZW9abkA="; buildInputs = lib.optional stdenv.isDarwin Security; From e81407c1ada309f37aae8c93edd9a4e379726e50 Mon Sep 17 00:00:00 2001 From: Bob van der Linden Date: Fri, 16 Sep 2022 16:50:33 +0200 Subject: [PATCH 078/176] Revert "cglm: install correct include/lib dir in pkg-config" --- pkgs/development/libraries/cglm/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/libraries/cglm/default.nix b/pkgs/development/libraries/cglm/default.nix index 9394eab133be..50a9bf62c54b 100644 --- a/pkgs/development/libraries/cglm/default.nix +++ b/pkgs/development/libraries/cglm/default.nix @@ -17,11 +17,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - cmakeFlags = [ - "-DCMAKE_INSTALL_INCLUDEDIR=include" - "-DCMAKE_INSTALL_LIBDIR=lib" - ]; - meta = with lib; { homepage = "https://github.com/recp/cglm"; description = "Highly Optimized Graphics Math (glm) for C"; From 68573339ad9ad07d5571807634af4d926cc92fcd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 14:54:53 +0000 Subject: [PATCH 079/176] python310Packages.appthreat-vulnerability-db: 2.0.5 -> 2.0.6 --- .../python-modules/appthreat-vulnerability-db/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix index 47f667a4688d..ac820337af02 100644 --- a/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix +++ b/pkgs/development/python-modules/appthreat-vulnerability-db/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "appthreat-vulnerability-db"; - version = "2.0.5"; + version = "2.0.6"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "AppThreat"; repo = "vulnerability-db"; rev = "refs/tags/v${version}"; - sha256 = "sha256-ThUkDCoRKefAqTmOxCk9W9LZlCqUU+jxF0egjthH4JI="; + sha256 = "sha256-tmvt5jqgfKxCW+/XvmSu7bTsT1Qk902c1qfR4IK66vg="; }; propagatedBuildInputs = [ From b61fd540893f02148c8d2fa219221b8b4982aba2 Mon Sep 17 00:00:00 2001 From: Lein Matsumaru Date: Fri, 16 Sep 2022 15:26:59 +0000 Subject: [PATCH 080/176] exploitdb: 2022-09-02 -> 2022-09-16 --- pkgs/tools/security/exploitdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index e3a684ae7448..836ebd553f96 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2022-09-02"; + version = "2022-09-16"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-gZdoaY3wm45DhM2jlKneOzMupmKsPbeOzHIBhmgDeV0="; + hash = "sha256-idQx5q5tO+jI3nb2LvFfAmd+nGbrBxWcn34daVZxWdE="; }; nativeBuildInputs = [ From d8d43da9b884f7d93cd0c2eaa2b368772deee588 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 15:38:14 +0000 Subject: [PATCH 081/176] go-graft: 0.2.9 -> 0.2.11 --- pkgs/applications/networking/go-graft/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/go-graft/default.nix b/pkgs/applications/networking/go-graft/default.nix index 2c3bc3c6e8a9..93d84928ab62 100644 --- a/pkgs/applications/networking/go-graft/default.nix +++ b/pkgs/applications/networking/go-graft/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "go-graft"; - version = "0.2.9"; + version = "0.2.11"; src = fetchFromGitHub { owner = "mzz2017"; repo = "gg"; rev = "v${version}"; - sha256 = "sha256-lsxZBhXgLJIy39kaOj5cCQUgZEDhlylklOdD4qHXks0="; + sha256 = "sha256-RIHlAE+hsMXA/kWfazAmhsEi298tPY4Mt4RR6vmo1oQ="; }; CGO_ENABLED = 0; From 44e57e837ad97e3173ff54f3616fceb2e4bdcc2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 15:55:00 +0000 Subject: [PATCH 082/176] hugo: 0.102.3 -> 0.103.0 --- pkgs/applications/misc/hugo/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hugo/default.nix b/pkgs/applications/misc/hugo/default.nix index ef996754f19d..0e176e1971e8 100644 --- a/pkgs/applications/misc/hugo/default.nix +++ b/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.102.3"; + version = "0.103.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-qk5iv/oJ2Q8vR5jFl0gR7gA0H/3sHJOOlr8rwg7HjUY="; + sha256 = "sha256-X78wmxEjw2noOjOj3uujXZHsPOSdZJ4KPz4Ia5sOu3I="; }; - vendorSha256 = "sha256-oWOu8vmxe0a/nIgkjpx7XrB49rjcuqnnpuOMtI9bLfY="; + vendorSha256 = "sha256-Y0+D5H7kWi+bacJm1pouYDPHnnSRPatOt6qPfkk92X4="; doCheck = false; From 965bbfa5f2717391c88f513f18186cf60b366dd8 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Fri, 16 Sep 2022 12:41:53 -0400 Subject: [PATCH 083/176] latte-dock: remove benley from maintainers I haven't used latte-dock for several years. --- pkgs/applications/misc/latte-dock/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/latte-dock/default.nix b/pkgs/applications/misc/latte-dock/default.nix index 6451a3efb70a..695fe938a9e3 100644 --- a/pkgs/applications/misc/latte-dock/default.nix +++ b/pkgs/applications/misc/latte-dock/default.nix @@ -29,7 +29,7 @@ mkDerivation rec { homepage = "https://github.com/psifidotos/Latte-Dock"; license = licenses.gpl2; platforms = platforms.unix; - maintainers = [ maintainers.benley maintainers.ysndr ]; + maintainers = [ maintainers.ysndr ]; }; From c24975c50a3bf07b52f5b260a911d2543f03d3eb Mon Sep 17 00:00:00 2001 From: Stig Palmquist Date: Fri, 16 Sep 2022 18:16:14 +0200 Subject: [PATCH 084/176] release-notes: mention perl 5.36 and verify_SSL patch --- nixos/doc/manual/from_md/release-notes/rl-2211.section.xml | 7 +++++++ nixos/doc/manual/release-notes/rl-2211.section.md | 2 ++ 2 files changed, 9 insertions(+) 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 931361984139..a0705f8a3c98 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 @@ -123,6 +123,13 @@ PHP now defaults to PHP 8.1, updated from 8.0. + + + Perl has been updated to 5.36, and its core module + HTTP::Tiny was patched to verify SSL/TLS + certificates by default. + + Cinnamon has been updated to 5.4. While at it, the cinnamon diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index ecebaae0d258..ce8da6c58b8f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -50,6 +50,8 @@ In addition to numerous new and upgraded packages, this release has the followin - PHP now defaults to PHP 8.1, updated from 8.0. +- Perl has been updated to 5.36, and its core module `HTTP::Tiny` was patched to verify SSL/TLS certificates by default. + - Cinnamon has been updated to 5.4. While at it, the cinnamon module now defaults to blueman as bluetooth manager and slick-greeter as lightdm greeter to match upstream. From 383f3704160e22957fe18cdde8497000c7d8e5d8 Mon Sep 17 00:00:00 2001 From: Noah Fontes Date: Fri, 16 Sep 2022 09:50:47 -0700 Subject: [PATCH 085/176] pythonPackages.cyclonedx-python-lib: fix checkPhase The unit tests for this package require the tests directory to be on the PYTHONPATH. We also can switch to pytest to run most of the TestOutputJson test cases, explicitly disabling the few that require network access. --- .../cyclonedx-python-lib/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 731aef1c647f..7704e7b8d5a4 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -6,6 +6,7 @@ , lxml , packageurl-python , poetry-core +, pytestCheckHook , python , pythonOlder , requirements-parser @@ -14,7 +15,6 @@ , toml , types-setuptools , types-toml -, unittestCheckHook , xmldiff }: @@ -48,7 +48,7 @@ buildPythonPackage rec { ]; checkInputs = [ - unittestCheckHook + pytestCheckHook jsonschema lxml xmldiff @@ -59,9 +59,17 @@ buildPythonPackage rec { ]; preCheck = '' - rm tests/test_output_json.py + export PYTHONPATH=tests''${PYTHONPATH+:$PYTHONPATH} ''; + pytestFlagsArray = [ "tests/" ]; + + disabledTests = [ + # These tests require network access. + "test_bom_v1_3_with_metadata_component" + "test_bom_v1_4_with_metadata_component" + ]; + meta = with lib; { description = "Python library for generating CycloneDX SBOMs"; homepage = "https://github.com/CycloneDX/cyclonedx-python-lib"; From 36bd72d1fe33429a3e6f33d96d5477083d1136cc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 16:59:11 +0000 Subject: [PATCH 086/176] kops: 1.24.2 -> 1.24.3 --- pkgs/applications/networking/cluster/kops/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/kops/default.nix b/pkgs/applications/networking/cluster/kops/default.nix index d988e061f3a2..a18e60f051bf 100644 --- a/pkgs/applications/networking/cluster/kops/default.nix +++ b/pkgs/applications/networking/cluster/kops/default.nix @@ -62,8 +62,8 @@ rec { }; kops_1_24 = mkKops rec { - version = "1.24.2"; - sha256 = "sha256-QEoaSkJ3fzUr2Fr3M2EOd/3iwq1ZX2YHEez2i0kjRmY="; + version = "1.24.3"; + sha256 = "sha256-o84060P2aHTIm61lSkz2/GqzYd2NYk1zKgGdNaHlWfA="; rev = "v${version}"; }; From 5acd266be47e0cb367eedd7ccd3c71813df3e961 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 17:57:09 +0000 Subject: [PATCH 087/176] macchina: 6.0.6 -> 6.1.2 --- pkgs/tools/misc/macchina/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index a38644f32dfd..b5f45e5c860b 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "macchina"; - version = "6.0.6"; + version = "6.1.2"; src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G95eQ5cIa5313k8YcuicbzPeq9VXVo2DgPMwfFMNXtk="; + sha256 = "sha256-zJr5RG1bbcKhPGygERSROC9JVfVigHauFzaqfY4KXC4="; }; - cargoSha256 = "sha256-mkAklLtG/sB0eLla5cveMqyPXwMCE5ufer8qA5L9chg="; + cargoSha256 = "sha256-QwZWm50D3N4OES9ypnIQOxEPYcUXVUcwKQ0/SUy7jyI="; nativeBuildInputs = [ installShellFiles ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; From 89f7fc5daa8707438bdf793d8309f28102b157df Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 18:06:00 +0000 Subject: [PATCH 088/176] minikube: 1.26.1 -> 1.27.0 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 605160e3d5ed..3b95b4e8cd95 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -12,9 +12,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.26.1"; + version = "1.27.0"; - vendorSha256 = "sha256-aw2B5wdhEQiTDp/BpJdXzY3XBm3eXlSQt83j4RHhMg0="; + vendorSha256 = "sha256-wAjgeq//vRUDUyVNTsVIxLXhA6fzTrYvn4klAPAv7DE="; doCheck = false; @@ -22,7 +22,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "sha256-08q/IdQEq1/KaIBN6ss8r1KbjSjZnhOW/BeaJ8BuYZM="; + sha256 = "sha256-Pn0F3363YJoOdWyoPy46HmIUwWr/I5TekalBp9hHg7I="; }; nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; From 40ed52944e1a60bd9a0fa9977f3a9b7679735d66 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Fri, 16 Sep 2022 23:44:56 +0530 Subject: [PATCH 089/176] tailscale: 1.30.1 -> 1.30.2 --- pkgs/servers/tailscale/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/tailscale/default.nix b/pkgs/servers/tailscale/default.nix index 91192ee371da..b36b5449caef 100644 --- a/pkgs/servers/tailscale/default.nix +++ b/pkgs/servers/tailscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "tailscale"; - version = "1.30.1"; + version = "1.30.2"; src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "sha256-sR1DB8Hc/JkCFaoj9FRRJhTeUWWoGUee2kx0EreUbWE="; + sha256 = "sha256-xs3LhldFP4gB5ouW1q8eiCZ5nZD6j9QROm/s+qFMA88="; }; vendorSha256 = "sha256-+7Cr7wmt4PheHJRAlyKhRd6QRIZBqrbVtn5I94h8lLo="; From 0727ac8a482cba9924d9dfd6d918616f68f95247 Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Fri, 16 Sep 2022 20:58:19 +0200 Subject: [PATCH 090/176] mautrix-whatsapp: 0.6.1 -> 0.7.0 https://github.com/mautrix/whatsapp/releases/tag/v0.7.0 --- pkgs/servers/mautrix-whatsapp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix index c32e1ef450cf..75d828ccf796 100644 --- a/pkgs/servers/mautrix-whatsapp/default.nix +++ b/pkgs/servers/mautrix-whatsapp/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "mautrix-whatsapp"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = "mautrix"; repo = "whatsapp"; rev = "v${version}"; - sha256 = "1AcjcE57ttjypnLU/+qpPsvApiuJfSX0qbPEQKOWfIM="; + hash = "sha256-OUGFp25M8wn8eWMuQHDh8Zp67x+VHVbyvuBHq+UE+NY="; }; buildInputs = [ olm ]; - vendorSha256 = "4CA/kDGohoJfdiXALN8M8fuPHQUrU2REHqVI7kKMnoY="; + vendorSha256 = "sha256-9pOe7jHgyrFP1Sj8O1KEVxcEaUPEE0+41HUfQoPxa2E="; doCheck = false; From fe394252c96c45f4c9849fbd0ba4dc89a01382ca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 19:10:27 +0000 Subject: [PATCH 091/176] oh-my-posh: 9.3.0 -> 9.3.1 --- pkgs/development/tools/oh-my-posh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/oh-my-posh/default.nix b/pkgs/development/tools/oh-my-posh/default.nix index e65566a66538..d7730945c0e6 100644 --- a/pkgs/development/tools/oh-my-posh/default.nix +++ b/pkgs/development/tools/oh-my-posh/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oh-my-posh"; - version = "9.3.0"; + version = "9.3.1"; src = fetchFromGitHub { owner = "jandedobbeleer"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5VI7L6aGJcaqcNK0bNGv5Hb0YQxTfLFDcMmiWKTyzWA="; + sha256 = "sha256-dVHf6nm7IRMpZ8Tx4VxRfBb8HOEfWc/5LgWZQ5LDbuk="; }; vendorSha256 = "sha256-A4+sshIzPla7udHfnMmbFqn+fW3SOCrI6g7tArzmh1E="; From 8febd612d19484e31a89448da7a0483373039fbf Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 19 Aug 2022 10:16:49 +0200 Subject: [PATCH 092/176] cosmopolitan: unstable-2022-03-22 -> 2.0.1 --- .../libraries/cosmopolitan/default.nix | 22 ++++++++++++++----- .../libraries/cosmopolitan/fix-paths.patch | 12 ++++++++++ 2 files changed, 28 insertions(+), 6 deletions(-) create mode 100644 pkgs/development/libraries/cosmopolitan/fix-paths.patch diff --git a/pkgs/development/libraries/cosmopolitan/default.nix b/pkgs/development/libraries/cosmopolitan/default.nix index f58e654cbfe3..7522fe2ba2ea 100644 --- a/pkgs/development/libraries/cosmopolitan/default.nix +++ b/pkgs/development/libraries/cosmopolitan/default.nix @@ -1,16 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped }: +{ lib, stdenv, fetchFromGitHub, unzip, bintools-unwrapped, coreutils, substituteAll }: stdenv.mkDerivation rec { pname = "cosmopolitan"; - version = "unstable-2022-03-22"; + version = "2.0.1"; src = fetchFromGitHub { owner = "jart"; - repo = "cosmopolitan"; - rev = "5022f9e9207ff2b79ddd6de6d792d3280e12fb3a"; - sha256 = "sha256-UjL4wR5HhuXiQXg6Orcx2fKiVGRPMJk15P779BP1fRA="; + repo = pname; + rev = version; + sha256 = "sha256-EPye7IRMmYHF7XYdDaJdA8alCLiF7MOkU/fVAzZA794="; }; + patches = [ + # make sure tests set PATH correctly + (substituteAll { src = ./fix-paths.patch; inherit coreutils; }) + ]; + nativeBuildInputs = [ bintools-unwrapped unzip ]; outputs = [ "out" "dist" ]; @@ -24,11 +29,16 @@ stdenv.mkDerivation rec { dontConfigure = true; dontFixup = true; + preCheck = '' + # some syscall tests fail because we're in a sandbox + rm test/libc/calls/sched_setscheduler_test.c + ''; + installPhase = '' runHook preInstall mkdir -p $out/{include,lib} install o/cosmopolitan.h $out/include - install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} $out/lib + install o/cosmopolitan.a o/libc/crt/crt.o o/ape/ape.{o,lds} o/ape/ape-no-modify-self.o $out/lib cp -RT . "$dist" runHook postInstall diff --git a/pkgs/development/libraries/cosmopolitan/fix-paths.patch b/pkgs/development/libraries/cosmopolitan/fix-paths.patch new file mode 100644 index 000000000000..85c59f3f12a3 --- /dev/null +++ b/pkgs/development/libraries/cosmopolitan/fix-paths.patch @@ -0,0 +1,12 @@ +--- a/test/tool/plinko/plinko_test.c ++++ b/test/tool/plinko/plinko_test.c +@@ -91,8 +91,8 @@ TEST(plinko, worksOrPrintsNiceError) { + sigaction(SIGQUIT, &savequit, 0); + sigaction(SIGPIPE, &savepipe, 0); + sigprocmask(SIG_SETMASK, &savemask, 0); + execve("bin/plinko.com", (char *const[]){"bin/plinko.com", 0}, +- (char *const[]){0}); ++ (char *const[]){"PATH=@coreutils@/bin", 0}); + _exit(127); + } + close(pfds[0][0]); From a7b998a0e36a56b1361a418a468ba4502b7e7c0d Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 19 Aug 2022 10:24:02 +0200 Subject: [PATCH 093/176] python-cosmopolitan: unbreak --- .../interpreters/python-cosmopolitan/default.nix | 4 ---- .../interpreters/python-cosmopolitan/ioctl.patch | 12 ------------ 2 files changed, 16 deletions(-) delete mode 100644 pkgs/development/interpreters/python-cosmopolitan/ioctl.patch diff --git a/pkgs/development/interpreters/python-cosmopolitan/default.nix b/pkgs/development/interpreters/python-cosmopolitan/default.nix index 14459a24aac2..a2a512b9cdf0 100644 --- a/pkgs/development/interpreters/python-cosmopolitan/default.nix +++ b/pkgs/development/interpreters/python-cosmopolitan/default.nix @@ -6,10 +6,6 @@ stdenv.mkDerivation rec { src = cosmopolitan.dist; - patches = [ - ./ioctl.patch # required /dev/tty - ]; - nativeBuildInputs = [ bintools-unwrapped unzip ]; # slashes are significant because upstream uses o/$(MODE)/foo.o diff --git a/pkgs/development/interpreters/python-cosmopolitan/ioctl.patch b/pkgs/development/interpreters/python-cosmopolitan/ioctl.patch deleted file mode 100644 index e6e7eb4fc7b0..000000000000 --- a/pkgs/development/interpreters/python-cosmopolitan/ioctl.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/third_party/python/python.mk b/third_party/python/python.mk -index f18c15060..b17455bca 100644 ---- a/third_party/python/python.mk -+++ b/third_party/python/python.mk -@@ -1818,7 +1818,6 @@ THIRD_PARTY_PYTHON_PYTEST_PYMAINS = \ - third_party/python/Lib/test/test_int_literal.py \ - third_party/python/Lib/test/test_bisect.py \ - third_party/python/Lib/test/test_pyexpat.py \ -- third_party/python/Lib/test/test_ioctl.py \ - third_party/python/Lib/test/test_getopt.py \ - third_party/python/Lib/test/test_sort.py \ - third_party/python/Lib/test/test_slice.py \ From 37e18a40ac8baed1a56b985859cbfaf2075a7298 Mon Sep 17 00:00:00 2001 From: Louis Bettens Date: Fri, 19 Aug 2022 11:39:18 +0200 Subject: [PATCH 094/176] cosmoc: update flags --- pkgs/development/tools/cosmoc/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/cosmoc/default.nix b/pkgs/development/tools/cosmoc/default.nix index f1e80d91df55..e64cf02e9f7e 100644 --- a/pkgs/development/tools/cosmoc/default.nix +++ b/pkgs/development/tools/cosmoc/default.nix @@ -8,18 +8,19 @@ stdenv.mkDerivation { dontUnpack = true; dontBuild = true; + # compiler arguments based on upstream README.md installPhase = '' runHook preInstall mkdir -p $out/bin cat <$out/bin/cosmoc #!${stdenv.shell} exec ${stdenv.cc}/bin/${stdenv.cc.targetPrefix}gcc \ - -O -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ + -Os -static -nostdlib -nostdinc -fno-pie -no-pie -mno-red-zone \ + -fno-omit-frame-pointer -pg -mnop-mcount -mno-tls-direct-seg-refs \ "\$@" \ - -Wl,--gc-sections -Wl,-z,max-page-size=0x1000 \ - -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds \ + -fuse-ld=bfd -Wl,-T,${cosmopolitan}/lib/ape.lds -Wl,--gc-sections \ -include ${cosmopolitan}/include/cosmopolitan.h \ - ${cosmopolitan}/lib/{crt.o,ape.o,cosmopolitan.a} + ${cosmopolitan}/lib/{crt.o,ape-no-modify-self.o,cosmopolitan.a} EOF chmod +x $out/bin/cosmoc runHook postInstall From baf43fdd2a4a9df4d266a3c7e979d53e1ce54315 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20He=C3=9Felmann?= Date: Fri, 16 Sep 2022 21:35:49 +0200 Subject: [PATCH 095/176] kube-linter: add changelog --- pkgs/development/tools/kube-linter/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/tools/kube-linter/default.nix b/pkgs/development/tools/kube-linter/default.nix index 7a8a6be85cda..b96e618da23b 100644 --- a/pkgs/development/tools/kube-linter/default.nix +++ b/pkgs/development/tools/kube-linter/default.nix @@ -34,6 +34,7 @@ buildGoModule rec { meta = with lib; { description = "A static analysis tool that checks Kubernetes YAML files and Helm charts"; homepage = "https://kubelinter.io"; + changelog = "https://github.com/stackrox/kube-linter/releases/tag/${version}"; license = licenses.asl20; maintainers = with maintainers; [ mtesseract stehessel ]; platforms = platforms.all; From 5dd4aacb6fd0d693278c601de95d7f23d5ad571d Mon Sep 17 00:00:00 2001 From: Emmanouil Kampitakis Date: Thu, 7 Jul 2022 22:06:22 +0200 Subject: [PATCH 096/176] maintainers: add madonius --- maintainers/maintainer-list.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 4ad1b83c20c3..79dacff88b1c 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -8104,6 +8104,13 @@ githubId = 109141; name = "Georges Dubus"; }; + madonius = { + email = "nixos@madoni.us"; + github = "madonius"; + githubId = 1246752; + name = "madonius"; + matrix = "@madonius:entropia.de"; + }; Madouura = { email = "madouura@gmail.com"; github = "Madouura"; From a5ce296b81ac35caa1db7efad20ae54056172065 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 19:42:55 +0000 Subject: [PATCH 097/176] python310Packages.aioswitcher: 2.0.10 -> 3.0.0 --- pkgs/development/python-modules/aioswitcher/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioswitcher/default.nix b/pkgs/development/python-modules/aioswitcher/default.nix index 5c88d8f8591a..d5b1aa4287b6 100644 --- a/pkgs/development/python-modules/aioswitcher/default.nix +++ b/pkgs/development/python-modules/aioswitcher/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "aioswitcher"; - version = "2.0.10"; + version = "3.0.0"; format = "pyproject"; src = fetchFromGitHub { owner = "TomerFi"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-Me0BvmCfj9bA7TXUHXLYe9a+d7nFnm7RpNVGtAzkBZM="; + sha256 = "sha256-zJS09YQRMv3B0daW0cgBRPoLQkPyGuBgMohf6E2yqaM="; }; nativeBuildInputs = [ From 3ae83c60f4fc30f3447ea700bc1983a6b01d2412 Mon Sep 17 00:00:00 2001 From: Emmanouil Kampitakis Date: Fri, 16 Sep 2022 21:45:03 +0200 Subject: [PATCH 098/176] alps: strip binary, add madonius as maintainer --- pkgs/servers/alps/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/alps/default.nix b/pkgs/servers/alps/default.nix index 2a98b9717085..a2f69473fbaa 100644 --- a/pkgs/servers/alps/default.nix +++ b/pkgs/servers/alps/default.nix @@ -14,6 +14,8 @@ buildGoModule rec { vendorSha256 = "sha256-cpY+lYM/nAX3nUaFknrRAavxDk8UDzJkoqFjJ1/KWeg="; ldflags = [ + "-s" + "-w" "-X main.themesPath=${placeholder "out"}/share/alps/themes" "-X git.sr.ht/~migadu/alps.PluginDir=${placeholder "out"}/share/alps/plugins" ]; @@ -33,6 +35,6 @@ buildGoModule rec { description = "A simple and extensible webmail."; homepage = "https://git.sr.ht/~migadu/alps"; license = licenses.mit; - maintainers = with maintainers; [ gordias booklearner ]; + maintainers = with maintainers; [ gordias booklearner madonius ]; }; } From c29a6a6416aebab42aa8c0d48380ed3f8caeb9cd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 16 Sep 2022 15:53:18 -0400 Subject: [PATCH 099/176] stduuid: init at 1.2.2 --- .../development/libraries/stduuid/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/stduuid/default.nix diff --git a/pkgs/development/libraries/stduuid/default.nix b/pkgs/development/libraries/stduuid/default.nix new file mode 100644 index 000000000000..07e43bb952c4 --- /dev/null +++ b/pkgs/development/libraries/stduuid/default.nix @@ -0,0 +1,22 @@ +{ stdenv, cmake, fetchFromGitHub, lib }: let + version = "1.2.2"; +in stdenv.mkDerivation { + name = "stduuid-${version}"; + + src = fetchFromGitHub { + owner = "mariusbancila"; + repo = "stduuid"; + rev = "v${version}"; + hash = "sha256-itx1OF1gmEEMy2tJlkN5dpF6o0dlesecuHYfpJdhf7c="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "A C++17 cross-platform implementation for UUIDs"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.shlevy ]; + homepage = "https://github.com/mariusbancila/stduuid"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfafedc083a3..901873972a4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21857,6 +21857,8 @@ with pkgs; stb = callPackage ../development/libraries/stb { }; + stduuid = callPackage ../development/libraries/stduuid { }; + stegsolve = callPackage ../tools/graphics/stegsolve { }; StormLib = callPackage ../development/libraries/StormLib { }; From 273bd654283c64e1faa357dd53c2a132549c05d1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 20:08:26 +0000 Subject: [PATCH 100/176] pqrs: 0.2.1 -> 0.2.2 --- pkgs/development/tools/pqrs/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pqrs/default.nix b/pkgs/development/tools/pqrs/default.nix index 6753446e4f44..20ec174015b3 100644 --- a/pkgs/development/tools/pqrs/default.nix +++ b/pkgs/development/tools/pqrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "pqrs"; - version = "0.2.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "manojkarthick"; repo = "pqrs"; rev = "v${version}"; - sha256 = "sha256-/PNGqveN4BSkURFVUpNgHDcPtz9vFhzdY8UK00AMaks="; + sha256 = "sha256-fqxPQUcd8DG+UYJRWLDJ9RpRkCWutEXjc6J+w1qv8PQ="; }; - cargoSha256 = "sha256-3mrNS0zNgsG7mX3RileFLi5iw3SrlEQC96FSANjpKT8="; + cargoSha256 = "sha256-/nfVu8eiQ8JAAUplSyA4eCQqZPCSrcxFzdc2gV95a2w="; meta = with lib; { description = "CLI tool to inspect Parquet files"; From 85f0887662676f17dbb45c10f7b391ba13bd035a Mon Sep 17 00:00:00 2001 From: Emmanouil Kampitakis Date: Fri, 16 Sep 2022 21:45:29 +0200 Subject: [PATCH 101/176] nixos/alps: init module --- .../from_md/release-notes/rl-2211.section.xml | 7 ++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/web-apps/alps.nix | 96 +++++++++++++++++++ 4 files changed, 106 insertions(+) create mode 100644 nixos/modules/services/web-apps/alps.nix 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 931361984139..eb3302440cf0 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 @@ -225,6 +225,13 @@ services.outline. + + + alps, + a simple and extensible webmail. Available as + services.alps. + + netbird, a zero diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index ecebaae0d258..183ad4749bea 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -83,6 +83,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [Outline](https://www.getoutline.com/), a wiki and knowledge base similar to Notion. Available as [services.outline](#opt-services.outline.enable). +- [alps](https://git.sr.ht/~migadu/alps), a simple and extensible webmail. Available as [services.alps](#opt-services.alps.enable). + - [netbird](https://netbird.io), a zero configuration VPN. Available as [services.netbird](options.html#opt-services.netbird.enable). diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index d5ab997bda38..998919f2a43a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1054,6 +1054,7 @@ ./services/video/epgstation/default.nix ./services/video/mirakurun.nix ./services/video/replay-sorcery.nix + ./services/web-apps/alps.nix ./services/web-apps/atlassian/confluence.nix ./services/web-apps/atlassian/crowd.nix ./services/web-apps/atlassian/jira.nix diff --git a/nixos/modules/services/web-apps/alps.nix b/nixos/modules/services/web-apps/alps.nix new file mode 100644 index 000000000000..b171729fd0a3 --- /dev/null +++ b/nixos/modules/services/web-apps/alps.nix @@ -0,0 +1,96 @@ +{ lib, pkgs, config, ... }: + +with lib; + +let + cfg = config.services.alps; +in { + options.services.alps = { + enable = mkEnableOption (lib.mdDoc "alps"); + + port = mkOption { + type = types.port; + default = 1323; + description = lib.mdDoc '' + TCP port the service should listen on. + ''; + }; + + bindIP = mkOption { + default = "[::]"; + type = types.str; + description = lib.mdDoc '' + The IP the service should listen on. + ''; + }; + + theme = mkOption { + type = types.enum [ "alps" "sourcehut" ]; + default = "sourcehut"; + description = lib.mdDoc '' + The frontend's theme to use. + ''; + }; + + imaps = { + port = mkOption { + type = types.port; + default = 993; + description = lib.mdDoc '' + The IMAPS server port. + ''; + }; + + host = mkOption { + type = types.str; + default = "[::1]"; + example = "mail.example.org"; + description = lib.mdDoc '' + The IMAPS server address. + ''; + }; + }; + + smtps = { + port = mkOption { + type = types.port; + default = 445; + description = lib.mdDoc '' + The SMTPS server port. + ''; + }; + + host = mkOption { + type = types.str; + default = cfg.imaps.host; + defaultText = "services.alps.imaps.host"; + example = "mail.example.org"; + description = lib.mdDoc '' + The SMTPS server address. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.alps = { + description = "alps is a simple and extensible webmail."; + documentation = [ "https://git.sr.ht/~migadu/alps" ]; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "network-online.target" ]; + + serviceConfig = { + ExecStart = '' + ${pkgs.alps}/bin/alps \ + -addr ${cfg.bindIP}:${toString cfg.port} \ + -theme ${cfg.theme} \ + imaps://${cfg.imaps.host}:${toString cfg.imaps.port} \ + smpts://${cfg.smtps.host}:${toString cfg.smtps.port} + ''; + StateDirectory = "alps"; + WorkingDirectory = "/var/lib/alps"; + DynamicUser = true; + }; + }; + }; +} From a1a2bb6be727f10e2c68a895572731dec3521d3a Mon Sep 17 00:00:00 2001 From: Felix Singer Date: Fri, 16 Sep 2022 22:37:27 +0200 Subject: [PATCH 102/176] mumble,murmur: 1.4.274 -> 1.4.287 Signed-off-by: Felix Singer --- pkgs/applications/networking/mumble/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix index d3a02cacfb60..890930ba89a2 100644 --- a/pkgs/applications/networking/mumble/default.nix +++ b/pkgs/applications/networking/mumble/default.nix @@ -98,14 +98,14 @@ let } source; source = rec { - version = "1.4.274"; + version = "1.4.287"; # Needs submodules src = fetchFromGitHub { owner = "mumble-voip"; repo = "mumble"; - rev = "cc73c7679b08158f91b02272efbb0e3e5dd9c9e4"; - sha256 = "sha256-QXczSLDhWLE4CDvBJ7NtqfL52bZJDisFo04AMHnMuN8="; + rev = "5d808e287e99b402b724e411a7a0848e00956a24"; + sha256 = "sha256-SYsGCuj3HeyAQRUecGLaRdJR9Rm7lbaM54spY/zx0jU="; fetchSubmodules = true; }; }; From 17ff485c6fae4c2a1bc8420b38e13eca12f5e129 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 20:49:18 +0000 Subject: [PATCH 103/176] rathole: 0.4.3 -> 0.4.4 --- pkgs/tools/networking/rathole/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/rathole/default.nix b/pkgs/tools/networking/rathole/default.nix index 74eb894f0d0f..ceaf89ef92e9 100644 --- a/pkgs/tools/networking/rathole/default.nix +++ b/pkgs/tools/networking/rathole/default.nix @@ -8,16 +8,16 @@ }: rustPlatform.buildRustPackage rec { pname = "rathole"; - version = "0.4.3"; + version = "0.4.4"; src = fetchFromGitHub { owner = "rapiz1"; repo = pname; rev = "v${version}"; - sha256 = "sha256-gqWgx03mUk6+9K4Yw5PHEBwFxsOR+48wvngT+wQnN1k="; + sha256 = "sha256-qhkgXS+Rku9OcFgFbHfELcjQmIHNvi3sC4bh5LKYzJQ="; }; - cargoSha256 = "sha256-dafOgZtiszkoi97PpAVMtdvJd5O3EK9hDVNLJ32FYzE="; + cargoSha256 = "sha256-3WY+VIRycqFmkVA+NdbU4glEkZecRM5eKI/reyNWVao="; nativeBuildInputs = [ pkg-config ]; From e008167ee5e0f0d9ab707aa92394b5ff88dcc065 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 20:59:12 +0000 Subject: [PATCH 104/176] python310Packages.asysocks: 0.2.1 -> 0.2.2 --- pkgs/development/python-modules/asysocks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/asysocks/default.nix b/pkgs/development/python-modules/asysocks/default.nix index 55cc6619e63e..e4f5f8758b1c 100644 --- a/pkgs/development/python-modules/asysocks/default.nix +++ b/pkgs/development/python-modules/asysocks/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "asysocks"; - version = "0.2.1"; + version = "0.2.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-j0UWCI6+x/CNjFSeXnXnqGtB5gQ6+SC6SJXPP2xlQVA="; + sha256 = "sha256-rhqML/w8Hp8xZogjc2ZD+Y9C9c/w1e4X7WNoFaLz9Ps="; }; propagatedBuildInputs = [ From 6309e71200281b9d44dbe61621a95f486e7fee21 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 21:46:56 +0000 Subject: [PATCH 105/176] sumneko-lua-language-server: 3.5.5 -> 3.5.6 --- .../development/tools/sumneko-lua-language-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/sumneko-lua-language-server/default.nix b/pkgs/development/tools/sumneko-lua-language-server/default.nix index 8faba993068c..162951447725 100644 --- a/pkgs/development/tools/sumneko-lua-language-server/default.nix +++ b/pkgs/development/tools/sumneko-lua-language-server/default.nix @@ -4,13 +4,13 @@ let in stdenv.mkDerivation rec { pname = "sumneko-lua-language-server"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "sumneko"; repo = "lua-language-server"; rev = version; - sha256 = "sha256-TSBV10QBD9TiQMsH800bSDbOzkD1orzHT4gLNWVE3Iw="; + sha256 = "sha256-S07/N6Cq/YG0kS2riPI8wy/fOxPHkMrGqpmUd+ymwJ0="; fetchSubmodules = true; }; From aac64d54b44d2a51d994de459b50b43edc3fc929 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 22:13:43 +0000 Subject: [PATCH 106/176] trivy: 0.31.3 -> 0.32.0 --- pkgs/tools/admin/trivy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/trivy/default.nix b/pkgs/tools/admin/trivy/default.nix index e2f0a4bdd3e5..520294855c04 100644 --- a/pkgs/tools/admin/trivy/default.nix +++ b/pkgs/tools/admin/trivy/default.nix @@ -5,17 +5,17 @@ buildGoModule rec { pname = "trivy"; - version = "0.31.3"; + version = "0.32.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "sha256-e+H5FH9UU2zK4GmxN04T87GdZYRZDVtA0FNw6t4kjgQ="; + sha256 = "sha256-o4wmHPdNKFcgLPFYLluLLP9ReXt2vL1LHmUmhNl/5cE="; }; # hash missmatch on across linux and darwin proxyVendor = true; - vendorSha256 = "sha256-QjJHmVqZTw5w1jR+EctS4VzeJMBpkCL3VGjeKeQmyPA="; + vendorSha256 = "sha256-QIJZwu+b8xkp3z7A+QESa3VdwEEtsWIDG2gdcCiFPh0="; excludedPackages = "misc"; From 75da5c2aa3097b06b78bc803669e7a39e02ca58b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 22:40:09 +0000 Subject: [PATCH 107/176] waypoint: 0.9.1 -> 0.10.0 --- pkgs/applications/networking/cluster/waypoint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/waypoint/default.nix b/pkgs/applications/networking/cluster/waypoint/default.nix index 8c056cdce01a..685a422a174e 100644 --- a/pkgs/applications/networking/cluster/waypoint/default.nix +++ b/pkgs/applications/networking/cluster/waypoint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "waypoint"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wvbtiu4WeuiHtyLkhwAB20XvpvHvy24xPSH5Lxtpea8="; + sha256 = "sha256-vyPYKEmAc2kmcCGF28wMq7oZa4ZcSKp5SyCMounspQA="; }; - vendorSha256 = "sha256-bDsmou4zmRz8DyENdteJ3MzhTpCgri4ISIgxi7fhQdc="; + vendorSha256 = "sha256-/WyqxK+FFSfR/Gyxy7K65KZDVfBM5Pp7WnoafF0AeQY="; nativeBuildInputs = [ go-bindata installShellFiles ]; From d529e6962d22d13e28439c67adbf1ef7381f7143 Mon Sep 17 00:00:00 2001 From: Timothy DeHerrera Date: Fri, 16 Sep 2022 16:56:11 -0600 Subject: [PATCH 108/176] qt6: 6.3.1 -> 6.3.2 --- pkgs/development/libraries/qt-6/fetch.sh | 2 +- pkgs/development/libraries/qt-6/srcs.nix | 256 +++++++++++------------ 2 files changed, 129 insertions(+), 129 deletions(-) diff --git a/pkgs/development/libraries/qt-6/fetch.sh b/pkgs/development/libraries/qt-6/fetch.sh index 70c9cedb0987..6849bfb40b82 100644 --- a/pkgs/development/libraries/qt-6/fetch.sh +++ b/pkgs/development/libraries/qt-6/fetch.sh @@ -1 +1 @@ -WGET_ARGS=( http://download.qt.io/official_releases/qt/6.3/6.3.1/submodules/ -A '*.tar.xz' ) +WGET_ARGS=( http://download.qt.io/official_releases/qt/6.3/6.3.2/submodules/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-6/srcs.nix b/pkgs/development/libraries/qt-6/srcs.nix index 07bb7fd494f7..d0ee4475b4f6 100644 --- a/pkgs/development/libraries/qt-6/srcs.nix +++ b/pkgs/development/libraries/qt-6/srcs.nix @@ -4,259 +4,259 @@ { qt3d = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qt3d-everywhere-src-6.3.1.tar.xz"; - sha256 = "1zpdafqm82hd2bijw20hi1ng81xwihsn9mm7n5ns4gr5zdnvc6cr"; - name = "qt3d-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt3d-everywhere-src-6.3.2.tar.xz"; + sha256 = "0gy73dlzj0hajxr0v68sljqvqclcryirm901icszg1mfvl4xw6zj"; + name = "qt3d-everywhere-src-6.3.2.tar.xz"; }; }; qt5compat = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qt5compat-everywhere-src-6.3.1.tar.xz"; - sha256 = "1zbcaswpl79ixcxzj85qzjq73962s4c7316pibwfrskqswmwcgm4"; - name = "qt5compat-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qt5compat-everywhere-src-6.3.2.tar.xz"; + sha256 = "1k30hnwnlbay1hnkdavgf6plsdzrryzcqd2qz8x11r477w7sr8wi"; + name = "qt5compat-everywhere-src-6.3.2.tar.xz"; }; }; qtactiveqt = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtactiveqt-everywhere-src-6.3.1.tar.xz"; - sha256 = "0axygqjqny6vjwmc5swn80xrcs97bcjwgxsg81f35srxpn9lxdb4"; - name = "qtactiveqt-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtactiveqt-everywhere-src-6.3.2.tar.xz"; + sha256 = "052mcwln989hp154kdrjxmif81glx4x3qcmnhss4n1ps4m28jw7w"; + name = "qtactiveqt-everywhere-src-6.3.2.tar.xz"; }; }; qtbase = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtbase-everywhere-src-6.3.1.tar.xz"; - sha256 = "00sfya41ihqb0zwg6wf1kiy02iymj6mk584hhk2c4s94khfl4r0a"; - name = "qtbase-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtbase-everywhere-src-6.3.2.tar.xz"; + sha256 = "19m9r8sf9mvyrwipn44if3nhding4ljys2mwf04b7dkhz16vlabr"; + name = "qtbase-everywhere-src-6.3.2.tar.xz"; }; }; qtcharts = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtcharts-everywhere-src-6.3.1.tar.xz"; - sha256 = "1xvwsabyfln3sih9764xknl2s3w4w069k210kgbh94bj50iwqc7k"; - name = "qtcharts-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtcharts-everywhere-src-6.3.2.tar.xz"; + sha256 = "1xpv7vijamm1iwx71wbyc7wqw9s35j1iz1ycp5c1a33hhq9lxa5a"; + name = "qtcharts-everywhere-src-6.3.2.tar.xz"; }; }; qtconnectivity = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtconnectivity-everywhere-src-6.3.1.tar.xz"; - sha256 = "1c4mnrl7fa8j8fmv5zbqak48nylhxpib7vmsbmmbqqcw19qy8p5j"; - name = "qtconnectivity-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtconnectivity-everywhere-src-6.3.2.tar.xz"; + sha256 = "0n56z6vdf4pc4jqrimsl6gd30vgac2sirz7z2v29d71ca1n6ajg2"; + name = "qtconnectivity-everywhere-src-6.3.2.tar.xz"; }; }; qtdatavis3d = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdatavis3d-everywhere-src-6.3.1.tar.xz"; - sha256 = "1wm8iigpml84zfkw3mb2kll0imszc2y19hkcfwq1wbr9w24xda43"; - name = "qtdatavis3d-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdatavis3d-everywhere-src-6.3.2.tar.xz"; + sha256 = "13xg4vs3wm47f3wbh56qnrd3wa130g0z4jhf494zd7y2n5vi4r7z"; + name = "qtdatavis3d-everywhere-src-6.3.2.tar.xz"; }; }; qtdeclarative = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdeclarative-everywhere-src-6.3.1.tar.xz"; - sha256 = "1s268fha3650dn1lqxf8jfa07wxpw09f6p7rjyiwq3w24d0nkrq3"; - name = "qtdeclarative-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdeclarative-everywhere-src-6.3.2.tar.xz"; + sha256 = "1hbw63828pp8vm9b46i2pkcbcpr4mq9nblhmpwrw2pflq0fi24xq"; + name = "qtdeclarative-everywhere-src-6.3.2.tar.xz"; }; }; qtdoc = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtdoc-everywhere-src-6.3.1.tar.xz"; - sha256 = "1qvhv2b9c6mz7r3sdx0l81a2jr9qri17y1y8k3d6qh488fxqrk32"; - name = "qtdoc-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtdoc-everywhere-src-6.3.2.tar.xz"; + sha256 = "001mf5vrgjz0hbi90qcp66lbs5hv3iickfv6780j2nsc94wjc5mp"; + name = "qtdoc-everywhere-src-6.3.2.tar.xz"; }; }; qtimageformats = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtimageformats-everywhere-src-6.3.1.tar.xz"; - sha256 = "0br1vqgx0hcc2nx32xviic94mvj6fbagrnzskdr7zdmvvyw140xd"; - name = "qtimageformats-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtimageformats-everywhere-src-6.3.2.tar.xz"; + sha256 = "0fnfhlvd12v1gk81x5zhhrkmn6k80n3zfw5in0yrqxvcmr68mjqx"; + name = "qtimageformats-everywhere-src-6.3.2.tar.xz"; }; }; qtlanguageserver = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtlanguageserver-everywhere-src-6.3.1.tar.xz"; - sha256 = "1g2azb4mdzh5zp7xc57g8l2a8wfi44wfjm6js88q4mmchyj4f4br"; - name = "qtlanguageserver-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlanguageserver-everywhere-src-6.3.2.tar.xz"; + sha256 = "00ya6lqwv2dq2g86c53aafisp5vnkgamylslg5fqd8ym29g6wraj"; + name = "qtlanguageserver-everywhere-src-6.3.2.tar.xz"; }; }; qtlottie = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtlottie-everywhere-src-6.3.1.tar.xz"; - sha256 = "1x8wmc6gwmxk92zjcsrbhrbqbfvnk7302ggghld5wk8jk5lsf2vl"; - name = "qtlottie-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtlottie-everywhere-src-6.3.2.tar.xz"; + sha256 = "1c092hmf114r8jfdhkhxnn3vywj93mg33whzav47gr9mbza44icq"; + name = "qtlottie-everywhere-src-6.3.2.tar.xz"; }; }; qtmultimedia = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtmultimedia-everywhere-src-6.3.1.tar.xz"; - sha256 = "0dkk3lmzi2fs13cnj8q1lpcs6gghj219826gkwnzyd6nmlm280vy"; - name = "qtmultimedia-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtmultimedia-everywhere-src-6.3.2.tar.xz"; + sha256 = "0hqwq0ad6z8c5kyyvbaddj00mciijn2ns2r60jc3mqh98nm2js3z"; + name = "qtmultimedia-everywhere-src-6.3.2.tar.xz"; }; }; qtnetworkauth = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtnetworkauth-everywhere-src-6.3.1.tar.xz"; - sha256 = "0apvsb2ip1m3kw8vi9spvf6f6q72ys8vr40rpyysi7shsjwm83yn"; - name = "qtnetworkauth-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtnetworkauth-everywhere-src-6.3.2.tar.xz"; + sha256 = "0mjnz87splyxq7jwydi5ws2aqb6j7czscrkns193w425x0dgy94l"; + name = "qtnetworkauth-everywhere-src-6.3.2.tar.xz"; }; }; qtpositioning = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtpositioning-everywhere-src-6.3.1.tar.xz"; - sha256 = "0v78wamvdw02kf9rq7m5v24q2g6jmgq4ch0fnfa014p1r978wy06"; - name = "qtpositioning-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtpositioning-everywhere-src-6.3.2.tar.xz"; + sha256 = "0zh45lf164nzwl1hh96qm64nyw9wzzrnm5s7sx761glz54q6l5xz"; + name = "qtpositioning-everywhere-src-6.3.2.tar.xz"; }; }; qtquick3d = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtquick3d-everywhere-src-6.3.1.tar.xz"; - sha256 = "0mhj0r6081bjkq3fsr1vh43zn587v9m20mdpnc979h5q8zp6d9rg"; - name = "qtquick3d-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquick3d-everywhere-src-6.3.2.tar.xz"; + sha256 = "00wwla3crql4wwbaz116icgc4liszi497g692z8fxllvp4ysm80x"; + name = "qtquick3d-everywhere-src-6.3.2.tar.xz"; }; }; qtquicktimeline = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtquicktimeline-everywhere-src-6.3.1.tar.xz"; - sha256 = "1gpb51d8r707sr0dnvbz65d4zwisfdw40s10kximaxwfrvq3r8aq"; - name = "qtquicktimeline-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtquicktimeline-everywhere-src-6.3.2.tar.xz"; + sha256 = "0njidyr7ahvrq1x1676v16qcp7lz2v2rhz0x3iw2mql90vrhk2h4"; + name = "qtquicktimeline-everywhere-src-6.3.2.tar.xz"; }; }; qtremoteobjects = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtremoteobjects-everywhere-src-6.3.1.tar.xz"; - sha256 = "19jcxxxj3q8vnf9cbgrp3q1pvgwsln8n16nk1gg822f6265h6vga"; - name = "qtremoteobjects-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtremoteobjects-everywhere-src-6.3.2.tar.xz"; + sha256 = "099b3vchi458i4fci9kfwan871jplqlk5l8q78mfnh33g80qnasi"; + name = "qtremoteobjects-everywhere-src-6.3.2.tar.xz"; }; }; qtscxml = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtscxml-everywhere-src-6.3.1.tar.xz"; - sha256 = "06c6dwwx3z26k9ff6nqagg70lws4l1c6drz1yi4z1lb3c56ibg01"; - name = "qtscxml-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtscxml-everywhere-src-6.3.2.tar.xz"; + sha256 = "1h90kiin6n4629nlzqkilhvn30q4ppr9kwbcxbsck4zss91yc6n5"; + name = "qtscxml-everywhere-src-6.3.2.tar.xz"; }; }; qtsensors = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtsensors-everywhere-src-6.3.1.tar.xz"; - sha256 = "1k301lgbiw3fiyryfr18k0dq89ls4xgs4n2pffs456msxmchn92b"; - name = "qtsensors-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsensors-everywhere-src-6.3.2.tar.xz"; + sha256 = "1r82rpn552737n04b0wvv8g9rzqxvsr1snd22bwfb4djjn5b47j5"; + name = "qtsensors-everywhere-src-6.3.2.tar.xz"; }; }; qtserialbus = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtserialbus-everywhere-src-6.3.1.tar.xz"; - sha256 = "1lkqv3r66fiddxbg0fv9w6l83adz3y8zq6i4pmd0hnxs0ivkz580"; - name = "qtserialbus-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialbus-everywhere-src-6.3.2.tar.xz"; + sha256 = "04j5q2lwvbzp977zayj48ixwg4mkq0x58fk88l4kfkgy1xmrwgnh"; + name = "qtserialbus-everywhere-src-6.3.2.tar.xz"; }; }; qtserialport = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtserialport-everywhere-src-6.3.1.tar.xz"; - sha256 = "0vk17cjj9jpdkgd8qwb1x0lijg0p2jxdzx4d67hd57brcl7didjf"; - name = "qtserialport-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtserialport-everywhere-src-6.3.2.tar.xz"; + sha256 = "0vsyqdibf8mn4481vb6sc4chgabbqzcxw1mxxm3kdik74cr0gln7"; + name = "qtserialport-everywhere-src-6.3.2.tar.xz"; }; }; qtshadertools = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtshadertools-everywhere-src-6.3.1.tar.xz"; - sha256 = "0nj35s2z5n438q7nqf6bnj3slwz2am3169ck1ixwqa0mjrv73dsr"; - name = "qtshadertools-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtshadertools-everywhere-src-6.3.2.tar.xz"; + sha256 = "1bmkrpk414clx8pnyrdslqlsnfmsdldmwrdcqzz6rwi8ymk2ggpn"; + name = "qtshadertools-everywhere-src-6.3.2.tar.xz"; }; }; qtsvg = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtsvg-everywhere-src-6.3.1.tar.xz"; - sha256 = "1xvxz2jfpr1al85rhwss7ji5vkxa812d0b888hry5f7pwqcg86bv"; - name = "qtsvg-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtsvg-everywhere-src-6.3.2.tar.xz"; + sha256 = "14i3f23k9k0731akpwa6zzhw5m3c0m2l5r7irvim4h4faah445ac"; + name = "qtsvg-everywhere-src-6.3.2.tar.xz"; }; }; qttools = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qttools-everywhere-src-6.3.1.tar.xz"; - sha256 = "1h96w4bzkbd80vr7lh6hnypdlmbzc1y52c2zrqzvkgm3587pa4n4"; - name = "qttools-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttools-everywhere-src-6.3.2.tar.xz"; + sha256 = "1lmfk5bhgg4daxkqrhmx4iyln7pyiz40c9cp6plyp35nz8ppvc75"; + name = "qttools-everywhere-src-6.3.2.tar.xz"; }; }; qttranslations = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qttranslations-everywhere-src-6.3.1.tar.xz"; - sha256 = "15yvvxw1vngnjlly6cady05ljamg01qiaqn2vh0xkph855gdbgfp"; - name = "qttranslations-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qttranslations-everywhere-src-6.3.2.tar.xz"; + sha256 = "1h66n9cx4g65c9wrgp32h9gm3r47gyh1nrcn3ivbfbvngfawqxpg"; + name = "qttranslations-everywhere-src-6.3.2.tar.xz"; }; }; qtvirtualkeyboard = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtvirtualkeyboard-everywhere-src-6.3.1.tar.xz"; - sha256 = "1f62q0gkz21nraaspy1nrg2ygjih5qgq37qns06snnfq0jr8kq2z"; - name = "qtvirtualkeyboard-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz"; + sha256 = "0czxh6wc1qgxns1qm6zcnck6i0nzaz3bzi3725qdw98738lyhvml"; + name = "qtvirtualkeyboard-everywhere-src-6.3.2.tar.xz"; }; }; qtwayland = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwayland-everywhere-src-6.3.1.tar.xz"; - sha256 = "1w60p1did7awdlzq5k8vnq2ncpskb07cpvz31cbv99bjs6igw53g"; - name = "qtwayland-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwayland-everywhere-src-6.3.2.tar.xz"; + sha256 = "0rwiirkibgpvx05pg2842j4dcq9ckxmcqxhaf50xx2i55z64ll83"; + name = "qtwayland-everywhere-src-6.3.2.tar.xz"; }; }; qtwebchannel = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebchannel-everywhere-src-6.3.1.tar.xz"; - sha256 = "0s16zx3qn3byldvhmsnwijm8rmizk8vpqj7fnwhjg6c67z10m8ma"; - name = "qtwebchannel-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebchannel-everywhere-src-6.3.2.tar.xz"; + sha256 = "0gqm09yqdq27kgb02idx5ycj14k5mjhh10ddp9jfs8lblimlgfni"; + name = "qtwebchannel-everywhere-src-6.3.2.tar.xz"; }; }; qtwebengine = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebengine-everywhere-src-6.3.1.tar.xz"; - sha256 = "0ivfsqd5c0cxsnssj6z37901cf6a47w50zaqgjiysvcm3ar36ymd"; - name = "qtwebengine-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebengine-everywhere-src-6.3.2.tar.xz"; + sha256 = "09j4w9ax8242d1yx3hmic7jcwidwdrn8sp7k89hj4l0n8mzkkd35"; + name = "qtwebengine-everywhere-src-6.3.2.tar.xz"; }; }; qtwebsockets = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebsockets-everywhere-src-6.3.1.tar.xz"; - sha256 = "06hj0pkdzjicmbiinjp1dk1ziz8cb3fgcwy7a0dxxjvzr680v64z"; - name = "qtwebsockets-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebsockets-everywhere-src-6.3.2.tar.xz"; + sha256 = "1smbvidaybphvsmaap9v1pbkibwmng11hb925g0ww4ghwzpxkb8q"; + name = "qtwebsockets-everywhere-src-6.3.2.tar.xz"; }; }; qtwebview = { - version = "6.3.1"; + version = "6.3.2"; src = fetchurl { - url = "${mirror}/official_releases/qt/6.3/6.3.1/submodules/qtwebview-everywhere-src-6.3.1.tar.xz"; - sha256 = "0f4hx3rqwg5wqnw37nrhcvi2fxshgfx72xmdc416j4gxhra1i6xl"; - name = "qtwebview-everywhere-src-6.3.1.tar.xz"; + url = "${mirror}/official_releases/qt/6.3/6.3.2/submodules/qtwebview-everywhere-src-6.3.2.tar.xz"; + sha256 = "06v69xl0fnbv4i1xbjaw7338iqyvim8d3q91qrrg7r2nqzjhiav7"; + name = "qtwebview-everywhere-src-6.3.2.tar.xz"; }; }; } From 67633310711af4862c5fe89e231bcc9bb3248d6b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 23:10:46 +0000 Subject: [PATCH 109/176] python310Packages.chess: 1.9.2 -> 1.9.3 --- pkgs/development/python-modules/chess/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/chess/default.nix b/pkgs/development/python-modules/chess/default.nix index e4f9c7bfb022..eed651ee3ada 100644 --- a/pkgs/development/python-modules/chess/default.nix +++ b/pkgs/development/python-modules/chess/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "chess"; - version = "1.9.2"; + version = "1.9.3"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "niklasf"; repo = "python-${pname}"; rev = "refs/tags/v${version}"; - sha256 = "sha256-RGAEkeE6YAik//yZt9mJdrFj4z0yxlHjZPLUaHd9yUQ="; + sha256 = "sha256-Qm6CNtie+oqZRCAs8qp8ythfs+OQvLZFK9YVLOuf918="; }; pythonImportsCheck = [ "chess" ]; From 38f48cfc4f060ddfd4c03187ed3f75b702a114c3 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 17 Sep 2022 00:13:19 +0100 Subject: [PATCH 110/176] meson: expose python3 in passthru --- pkgs/development/tools/build-managers/meson/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/build-managers/meson/default.nix b/pkgs/development/tools/build-managers/meson/default.nix index 866fa303148a..5107438fe91d 100644 --- a/pkgs/development/tools/build-managers/meson/default.nix +++ b/pkgs/development/tools/build-managers/meson/default.nix @@ -103,6 +103,10 @@ python3.pkgs.buildPythonApplication rec { installShellCompletion --bash data/shell-completions/bash/meson ''; + passthru = { + inherit python3; + }; + meta = with lib; { homepage = "https://mesonbuild.com"; description = "An open source, fast and friendly build system made in Python"; From 577d2454c2a2d2cf3876a232fd809337e0181ae4 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Fri, 16 Sep 2022 22:44:36 +0100 Subject: [PATCH 111/176] rizin: 0.4.0 -> 0.4.1 --- pkgs/development/tools/analysis/rizin/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index c74b63404ab7..eb39635243d2 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -18,16 +18,15 @@ , ninja , capstone , tree-sitter -, python3 }: stdenv.mkDerivation rec { pname = "rizin"; - version = "0.4.0"; + version = "0.4.1"; src = fetchurl { url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; - sha256 = "sha256-CeuoaE/oE89Cpxa1mobT1lr84BPX6LJ14UXoSdM2a1o="; + sha256 = "sha256-Zp2Va5l4IKNuQjzzXUgqqZhJJUuWWM72hERZkS39v7g="; }; mesonFlags = [ @@ -41,7 +40,13 @@ stdenv.mkDerivation rec { "-Duse_sys_tree_sitter=enabled" ]; - nativeBuildInputs = [ pkg-config meson ninja cmake (python3.withPackages (ps: [ ps.setuptools ])) ]; + nativeBuildInputs = [ + pkg-config + meson + meson.python3.pkgs.pyyaml + ninja + cmake + ]; # meson's find_library seems to not use our compiler wrapper if static parameter # is either true/false... We work around by also providing LIBRARY_PATH From 795fbbf5ccae482a2f670baeb52cedf2d708eac1 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Fri, 16 Sep 2022 19:22:18 -0400 Subject: [PATCH 112/176] ftgl: drop an impure -dylib_file on darwin The build may outright fail because of this on recent macOS: ftgl> clang-11: error: no such file or directory: '/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib' --- pkgs/development/libraries/ftgl/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 466ffcbb73a0..46d6180eb1dc 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -23,6 +23,14 @@ stdenv.mkDerivation rec { hash = "sha256-6TDNGoMeBLnucmHRgEDIVWcjlJb7N0sTluqBwRMMWn4="; }; + # GL_DYLIB is hardcoded to an impure path + # /System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib + # and breaks build on recent macOS versions + postPatch = '' + substituteInPlace m4/gl.m4 \ + --replace ' -dylib_file $GL_DYLIB: $GL_DYLIB' "" + ''; + nativeBuildInputs = [ autoreconfHook doxygen From fbccc52f83aa9b42894919929d7f2a47fdd1730c Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 17 Sep 2022 01:00:33 +0100 Subject: [PATCH 113/176] capstone: use fixDarwinDylibNames on darwin --- pkgs/development/libraries/capstone/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/capstone/default.nix b/pkgs/development/libraries/capstone/default.nix index 6f5a8e340ad6..a2ace544b7c9 100644 --- a/pkgs/development/libraries/capstone/default.nix +++ b/pkgs/development/libraries/capstone/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config }: +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, fixDarwinDylibNames +}: stdenv.mkDerivation rec { pname = "capstone"; @@ -31,6 +36,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config + ] ++ lib.optionals stdenv.isDarwin [ + fixDarwinDylibNames ]; enableParallelBuilding = true; From 9c3247807970266865bdb2f5c915e200a5397c36 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Sat, 17 Sep 2022 01:00:51 +0100 Subject: [PATCH 114/176] rizin: enable on darwin --- pkgs/development/tools/analysis/rizin/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index eb39635243d2..5f14a4017c52 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -58,6 +58,9 @@ stdenv.mkDerivation rec { fi done export LIBRARY_PATH + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace binrz/rizin/macos_sign.sh \ + --replace 'codesign' '# codesign' ''; buildInputs = [ @@ -81,6 +84,6 @@ stdenv.mkDerivation rec { homepage = "https://rizin.re/"; license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin makefu mic92 ]; - platforms = with lib.platforms; linux; + platforms = with lib.platforms; unix; }; } From 2c3f33fd7e900d2cac90e8a096d364757f26759e Mon Sep 17 00:00:00 2001 From: nixpkgs-upkeep-bot Date: Sat, 17 Sep 2022 00:24:47 +0000 Subject: [PATCH 115/176] vscode: 1.71.0 -> 1.71.2 --- pkgs/applications/editors/vscode/vscode.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/editors/vscode/vscode.nix b/pkgs/applications/editors/vscode/vscode.nix index a0ffaf348d06..1ae65c1cbf4b 100644 --- a/pkgs/applications/editors/vscode/vscode.nix +++ b/pkgs/applications/editors/vscode/vscode.nix @@ -18,17 +18,17 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0cnrbjqcnkv7ybj9j7l0lcnfnxq18mddhdkj9797928q643bmj6z"; - x86_64-darwin = "1d9gb3i2k0c9cn38igg1nm91bfqdi4xg29zlprqsqh98ijwqy25y"; - aarch64-linux = "1jm8ll8f4m99ly53rv7000ng9a0l8jn4xpc6kfhmqdnf0jqfncsh"; - aarch64-darwin = "1awmaxkr5nl513c50g6k4r2j3w8p2by1j9i3kw7vkmwn91bk24i4"; - armv7l-linux = "1d2hl9jy1kfkzn4j7qkp3k8j1qc3r9rpqhvkfrr2axcqrahcrfsd"; + x86_64-linux = "0ar8gpklaa0aa3k1934jyg2vh65hzncx0awl1f0wz8n4fjasfrpc"; + x86_64-darwin = "0jkpzyg2pk2d88w2ffrp2lr0qadss7ccycx4vpmjmw62d3sap8n1"; + aarch64-linux = "1g7lzqghagz63pljg4wy34z706j70vjmk49cl8v27jbnsgnva56a"; + aarch64-darwin = "132ml95xlyv5c343bfv0gpgr8rmk85xspsy9baninlmhnmy7mivv"; + armv7l-linux = "04anb6r7hkk3y3vahx32nxj5dz2i66rrnl0561xkcjr4cqvxykiw"; }.${system} or throwSystem; in callPackage ./generic.nix rec { # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.71.0"; + version = "1.71.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; From 174e579bd529667fddb76b00594d77f4ea614bc7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Tue, 13 Sep 2022 11:03:15 -0400 Subject: [PATCH 116/176] genact: 1.0.2 -> 1.1.1 --- pkgs/applications/misc/genact/default.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/genact/default.nix b/pkgs/applications/misc/genact/default.nix index 97abbaca77a0..c5d48ff454e4 100644 --- a/pkgs/applications/misc/genact/default.nix +++ b/pkgs/applications/misc/genact/default.nix @@ -1,17 +1,32 @@ -{ lib, rustPlatform, fetchFromGitHub }: +{ lib, rustPlatform, fetchFromGitHub, jq }: rustPlatform.buildRustPackage rec { pname = "genact"; - version = "1.0.2"; + version = "1.1.1"; src = fetchFromGitHub { owner = "svenstaro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-lZNVXBIYl9niqdwNcSzQwQTdxlA4kKQ/WrEt93cQDJU="; + sha256 = "sha256-Mw6mPOxiWnYu2QgqL4VccwwJhdxZ7zLJyX/oJWfGUhw="; }; - cargoSha256 = "sha256-9IiA7KAaj9bLJ7QSB/ojLEiUVv0FGYsu9by4NSfMtiE="; + cargoSha256 = "sha256-ygQklcRjdffGl0s77MwKsyHVJWqWJZHq4SU38cSMVug="; + + depsExtraArgs = { + nativeBuildInputs = [ jq ]; + postBuild = '' + pushd $name/humansize + + [ -d feature-tests ] && rm -r feature-tests + + jq '.files |= with_entries(select(.key | startswith("feature-tests") | not))' \ + -c .cargo-checksum.json > .cargo-checksum.json.new + mv .cargo-checksum.json{.new,} + + popd + ''; + }; meta = with lib; { description = "A nonsense activity generator"; From 7ade6e7023a1ff5cb0e87f5312f66e078268998d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 01:34:31 +0000 Subject: [PATCH 117/176] python310Packages.fastcore: 1.5.26 -> 1.5.27 --- pkgs/development/python-modules/fastcore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix index c8a6c42077fe..1fd3af291fec 100644 --- a/pkgs/development/python-modules/fastcore/default.nix +++ b/pkgs/development/python-modules/fastcore/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fastcore"; - version = "1.5.26"; + version = "1.5.27"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-WA6EgdyZ6zQGCzeQsHUD304WMCarjhGEpqXXBhBsxNw="; + sha256 = "sha256-LFkjxcotJoHIX0GdKKqUSFF4/HSWc/sLwb34iuBrQIg="; }; propagatedBuildInputs = [ From 3c2524933266d552ce50f1d2899cab1844224fd0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 01:41:08 +0000 Subject: [PATCH 118/176] pgcli: 3.4.1 -> 3.5.0 --- pkgs/development/python-modules/pgcli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index bb369ffdc9d2..19215087742d 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -21,11 +21,11 @@ # integrating with ipython-sql buildPythonPackage rec { pname = "pgcli"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8DkwGH4n1g32WMqKBPtgHsXXR2xzXysVQsat7Fysj+I="; + sha256 = "sha256-zESNlRWfwJA9NhgpkneKCW7aV1LWYNR2cTg8jiv2M/E="; }; postPatch = '' From 4d6eb52bb70277b4fc0e37088c0e7f61b99e2a26 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 17 Sep 2022 13:00:08 +1000 Subject: [PATCH 119/176] sx-go: fix darwin build --- pkgs/tools/security/sx-go/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/tools/security/sx-go/default.nix index 76ed8a7d55c1..626851b1824f 100644 --- a/pkgs/tools/security/sx-go/default.nix +++ b/pkgs/tools/security/sx-go/default.nix @@ -2,6 +2,7 @@ , lib , buildGoModule , fetchFromGitHub +, fetchpatch , libpcap }: @@ -18,6 +19,16 @@ buildGoModule rec { vendorSha256 = "sha256-TWRMNt6x8zuvhP1nz4R6IVCX+9HityvVpzxRhDiMyO4="; + patches = [ + # Fix darwin builds: + # https://github.com/v-byte-cpu/sx/pull/120 + (fetchpatch { + name = "non-linux-method-signature.patch"; + url = "https://github.com/v-byte-cpu/sx/commit/56457bfaa49eb6fbb7a33d7092d9c636b9c85895.patch"; + hash = "sha256-0lCu3tZ0fEiC7qWfk1APLVwwrK9eovbVa/yG7OuXEWQ="; + }) + ]; + buildInputs = [ libpcap ]; @@ -28,7 +39,6 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Command-line network scanner"; homepage = "https://github.com/v-byte-cpu/sx"; license = licenses.mit; From 5b43c0dcd8e515b97f9579b553461496fab77523 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 03:21:47 +0000 Subject: [PATCH 120/176] python310Packages.immutables: 0.18 -> 0.19 --- pkgs/development/python-modules/immutables/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 34a48ed2a1f6..30646e28ca98 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.18"; + version = "0.19"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,8 +17,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "MagicStack"; repo = pname; - rev = "v${version}"; - hash = "sha256-lXCoPTcpTOv9K0xCVjbrP3qlzP9tfk/e3Rk3oOmbS/Y="; + rev = "refs/tags/v${version}"; + hash = "sha256-yW+pmAryBp6bvjolN91ACDkk5zxvKfu4nRLQSy71kqs="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ From 74d81b49086d812d6beb2bfaa245ba0d454dbc3f Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Fri, 16 Sep 2022 12:52:35 -0300 Subject: [PATCH 121/176] solana-validator: fix eval --- pkgs/applications/blockchains/solana-validator/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/solana-validator/default.nix b/pkgs/applications/blockchains/solana-validator/default.nix index d9e159966a73..503d4b404e72 100644 --- a/pkgs/applications/blockchains/solana-validator/default.nix +++ b/pkgs/applications/blockchains/solana-validator/default.nix @@ -13,7 +13,6 @@ , protobuf , clang , llvm -, pkgconfig , openssl , libclang , rustfmt @@ -74,7 +73,7 @@ rustPlatform.buildRustPackage rec { "-isystem ${libclang.lib}/lib/clang/${lib.getVersion clang}/include"; LLVM_CONFIG_PATH = "${llvm}/bin/llvm-config"; - nativeBuildInputs = [ clang llvm pkgconfig protobuf rustfmt perl ]; + nativeBuildInputs = [ clang llvm pkg-config protobuf rustfmt perl ]; buildInputs = [ openssl zlib libclang hidapi ] ++ (lib.optionals stdenv.isLinux [ udev ]); strictDeps = true; From 4afab7d55554caa4464259f37da6ff0c050bcd4d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 03:47:00 +0000 Subject: [PATCH 122/176] python310Packages.netcdf4: 1.6.0 -> 1.6.1 --- pkgs/development/python-modules/netcdf4/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/netcdf4/default.nix b/pkgs/development/python-modules/netcdf4/default.nix index 4908e1eb8aee..f0606f769194 100644 --- a/pkgs/development/python-modules/netcdf4/default.nix +++ b/pkgs/development/python-modules/netcdf4/default.nix @@ -3,13 +3,13 @@ }: buildPythonPackage rec { pname = "netCDF4"; - version = "1.6.0"; + version = "1.6.1"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-le+jc9mj4c0N9xk+duZoDZ7KKOYAl8qBOa/qikNGumM="; + sha256 = "sha256-uo3F1lKTqZ8a+4wqz1iNkD/f3BljpiVFtnf6JzQmKng="; }; checkInputs = [ pytest ]; From 52a8e1e9a082a926c76f236c24e7b27d95c93b4f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 03:51:12 +0000 Subject: [PATCH 123/176] python310Packages.zodbpickle: 2.3 -> 2.4 --- pkgs/development/python-modules/zodbpickle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zodbpickle/default.nix b/pkgs/development/python-modules/zodbpickle/default.nix index de1f8dfd3aaf..ae9e15ecb80d 100644 --- a/pkgs/development/python-modules/zodbpickle/default.nix +++ b/pkgs/development/python-modules/zodbpickle/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "zodbpickle"; - version = "2.3"; + version = "2.4"; disabled = isPyPy; # https://github.com/zopefoundation/zodbpickle/issues/10 src = fetchPypi { inherit pname version; - sha256 = "sha256-5MtccZcF6Lseju5Kok4gcaMJTs8ng9h0B6uCLxZto6I="; + sha256 = "sha256-vWzJIPKDO6bTWzvxwyaekhDr/AHs1/F2jCL2OqoHU60="; }; # fails.. From fe2c9e2ec6c8f725fd5227cb421524c4400b52e6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 04:07:44 +0000 Subject: [PATCH 124/176] python310Packages.json-stream: 1.4.0 -> 1.4.2 --- pkgs/development/python-modules/json-stream/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/json-stream/default.nix b/pkgs/development/python-modules/json-stream/default.nix index e6a8a68ddb9e..15f6724af79e 100644 --- a/pkgs/development/python-modules/json-stream/default.nix +++ b/pkgs/development/python-modules/json-stream/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "json-stream"; - version = "1.4.0"; + version = "1.4.2"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ebB8l8H6yPLoCXmVOy60IijdBI61SEzJInC30aMe9Bk="; + hash = "sha256-zsjKOqkXy3Je7z8U4M016a4t2cWdUqL2tf27Dc8a/gw="; }; propagatedBuildInputs = [ From e29ef34a5678dbb47f64cfe5c9f800366c07d25a Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Sep 2022 04:20:00 +0000 Subject: [PATCH 125/176] ncspot: 0.11.0 -> 0.11.1 https://github.com/hrkfdn/ncspot/releases/tag/v0.11.1 --- pkgs/applications/audio/ncspot/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/ncspot/default.nix b/pkgs/applications/audio/ncspot/default.nix index e0d50063926f..3037bfcf8081 100644 --- a/pkgs/applications/audio/ncspot/default.nix +++ b/pkgs/applications/audio/ncspot/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.11.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-mtveGRwadcct9R8CxLWCvT9FamK2PnicpeSvL4iT4oE="; + sha256 = "sha256-q4jOfcU2sNKISgO9vX2Rao2JljiYzWwB3WWMIvy8rII="; }; - cargoSha256 = "sha256-JqHJY91q2vm0x819zUkBBAObpnXN5aPde8m5UJ2NeNY="; + cargoSha256 = "sha256-f8yo60Gi2OdJMNxssMhladh82/ZeZ0ZWV7WmTcQ8jYo="; nativeBuildInputs = [ pkg-config ]; From c85040af5cfcd191afac5db6ec122dcfa65ebc1d Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Sep 2022 04:20:00 +0000 Subject: [PATCH 126/176] pgcli: use psycopg3 pgcli 3.5.0 supports psycopg 3 --- pkgs/development/python-modules/pgcli/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pgcli/default.nix b/pkgs/development/python-modules/pgcli/default.nix index 19215087742d..0e193d4c5c69 100644 --- a/pkgs/development/python-modules/pgcli/default.nix +++ b/pkgs/development/python-modules/pgcli/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , cli-helpers , click , configobj , prompt-toolkit -, psycopg2 +, psycopg , pygments , sqlparse , pgspecial @@ -28,17 +29,12 @@ buildPythonPackage rec { sha256 = "sha256-zESNlRWfwJA9NhgpkneKCW7aV1LWYNR2cTg8jiv2M/E="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace "pgspecial>=1.13.1,<2.0.0" "pgspecial>=1.13.1" - ''; - propagatedBuildInputs = [ cli-helpers click configobj prompt-toolkit - psycopg2 + psycopg pygments sqlparse pgspecial From 0c8c1d915c5f1036bb1c56c7840a1abd35a5504e Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 17 Sep 2022 04:20:00 +0000 Subject: [PATCH 127/176] tflint: 0.40.0 -> 0.40.1 https://github.com/terraform-linters/tflint/releases/tag/v0.40.1 --- pkgs/development/tools/analysis/tflint/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint/default.nix b/pkgs/development/tools/analysis/tflint/default.nix index 0c2cee6d31df..8f3333f81580 100644 --- a/pkgs/development/tools/analysis/tflint/default.nix +++ b/pkgs/development/tools/analysis/tflint/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tflint"; - version = "0.40.0"; + version = "0.40.1"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cJGzE+J3JLwH2NWl81kL7AfuYox2kKQvTFdAPUMneFY="; + sha256 = "sha256-Z9hkcJxNQnOjgoJ6K4ZklRwxzWZLE/PiKCEISkZqPHs="; }; - vendorSha256 = "sha256-+2A/yB7yO8p2Q3ZhMv5TqpkBAu7KHq8PefXsIDM/XUg="; + vendorSha256 = "sha256-sOYQs1hhyX3cjvQ3EmVVSc5HWHnrRDO2VVlzIYi4JZI="; doCheck = false; From a9133913e433a577e6e959dbb0e2970a28513111 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 04:22:04 +0000 Subject: [PATCH 128/176] python310Packages.jwcrypto: 1.3.1 -> 1.4.2 --- pkgs/development/python-modules/jwcrypto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/jwcrypto/default.nix b/pkgs/development/python-modules/jwcrypto/default.nix index ce035c1c64e0..3ff7cb5f039c 100644 --- a/pkgs/development/python-modules/jwcrypto/default.nix +++ b/pkgs/development/python-modules/jwcrypto/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "1.3.1"; + version = "1.4.2"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-VLVRsRX/tNErHx7pO4uipxu4VWuj2F1i9wdUlhPah3w="; + hash = "sha256-gKNentGzssQ84D2SxdSObQtmR+KqJhjkljRIkj14o3s="; }; propagatedBuildInputs = [ From 7462e7a9e5437d28d1385f2bcc3fd6d9aedcb81a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 04:29:27 +0000 Subject: [PATCH 129/176] python310Packages.korean-lunar-calendar: 0.2.1 -> 0.3.1 --- .../python-modules/korean-lunar-calendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/korean-lunar-calendar/default.nix b/pkgs/development/python-modules/korean-lunar-calendar/default.nix index a1b22a727ad8..c4a1672dd5e1 100644 --- a/pkgs/development/python-modules/korean-lunar-calendar/default.nix +++ b/pkgs/development/python-modules/korean-lunar-calendar/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "korean-lunar-calendar"; - version = "0.2.1"; + version = "0.3.1"; src = fetchPypi { inherit version; pname = "korean_lunar_calendar"; - sha256 = "0p97r21298ipgvsqh978aq2n6cvybzp8bskcvj15mm1f76qm9khj"; + sha256 = "sha256-6yxIUSSgYQFpJr3qbYnv35uf2/FttViVts8eW+wXuFc="; }; # no real tests From 4a48f8e21a1b7cb6a08db331c1ed6fd65cceced9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stanis=C5=82aw=20Pitucha?= Date: Sat, 17 Sep 2022 14:36:10 +1000 Subject: [PATCH 130/176] wayout: mark as unsupported rather than broken on darwin --- pkgs/tools/wayland/wayout/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/wayland/wayout/default.nix b/pkgs/tools/wayland/wayout/default.nix index bf949cfc0549..041c3dfe8cce 100644 --- a/pkgs/tools/wayland/wayout/default.nix +++ b/pkgs/tools/wayland/wayout/default.nix @@ -22,7 +22,7 @@ rustPlatform.buildRustPackage rec { homepage = "https://git.sr.ht/~shinyzenith/wayout"; license = licenses.bsd2; maintainers = with maintainers; [ onny ]; - broken = stdenv.isDarwin; # Build failed on Darwin + platforms = platforms.linux; }; } From 507e65b5db1d76b9e5ef777d471144e758ffcf48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 04:37:20 +0000 Subject: [PATCH 131/176] python310Packages.life360: 5.1.0 -> 5.1.1 --- pkgs/development/python-modules/life360/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/life360/default.nix b/pkgs/development/python-modules/life360/default.nix index 372d9b653363..15a0e9891aa7 100644 --- a/pkgs/development/python-modules/life360/default.nix +++ b/pkgs/development/python-modules/life360/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "life360"; - version = "5.1.0"; + version = "5.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "pnbruckner"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-/daZ/R3qhdPfvdGra0W0rEEXl6Bux5O8oTuEuCkO3bE="; + hash = "sha256-Fsv0lK0C9suVqgeaxKVuyAacHzHJJ1FHXzzy95RnhWw="; }; propagatedBuildInputs = [ From 995927a29022edc98b973bb8e5619d6fe0444133 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 05:30:40 +0000 Subject: [PATCH 132/176] ckbcomp: 1.209 -> 1.210 --- pkgs/tools/X11/ckbcomp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/ckbcomp/default.nix b/pkgs/tools/X11/ckbcomp/default.nix index 0d1a35c0aaaf..6481971ed0f3 100644 --- a/pkgs/tools/X11/ckbcomp/default.nix +++ b/pkgs/tools/X11/ckbcomp/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "ckbcomp"; - version = "1.209"; + version = "1.210"; src = fetchFromGitLab { domain = "salsa.debian.org"; owner = "installer-team"; repo = "console-setup"; rev = version; - sha256 = "sha256-fTAntT2XqerCwINHXLis1KE/8h4AzXo1zg3PzglTPTg="; + sha256 = "sha256-Np1u8oYIRwWlGpnpp5+VvYkZOkphv225p34og4O+HDE="; }; buildInputs = [ perl ]; From 9cb166091c3a84df445a83a45da66e08aa142e54 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 05:32:12 +0000 Subject: [PATCH 133/176] clingo: 5.6.0 -> 5.6.1 --- pkgs/applications/science/logic/potassco/clingo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/potassco/clingo.nix b/pkgs/applications/science/logic/potassco/clingo.nix index d46efe18c984..0065ff3ef25c 100644 --- a/pkgs/applications/science/logic/potassco/clingo.nix +++ b/pkgs/applications/science/logic/potassco/clingo.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "clingo"; - version = "5.6.0"; + version = "5.6.1"; src = fetchFromGitHub { owner = "potassco"; repo = "clingo"; rev = "v${version}"; - sha256 = "sha256-3qyQ7CnpELs6IsDxrW+IbV/TmlfYxP9VIVVjc7sM9fg="; + sha256 = "sha256-blr2GPa/ZwVfvot6wUcQmdN/mLEox6tjIWtr0geeoDI="; }; nativeBuildInputs = [ cmake ]; From 52ccb59ee2488eb8f2489fc4c05e0ce87f4ed066 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 05:35:59 +0000 Subject: [PATCH 134/176] clojure: 1.11.1.1149 -> 1.11.1.1161 --- pkgs/development/interpreters/clojure/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/clojure/default.nix b/pkgs/development/interpreters/clojure/default.nix index 49cba2ca6214..27aefa9e2849 100644 --- a/pkgs/development/interpreters/clojure/default.nix +++ b/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.11.1.1149"; + version = "1.11.1.1161"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-IIhonPSwpADNAuv9DQIKrdsJcGAlX+6uHe+jvA6i3KQ="; + sha256 = "sha256-B+NSIS1lHLqtLImY2gRYwYTrilJrbmDUvqd2H8UunA4="; }; nativeBuildInputs = [ From 97daa67d117f291e1ad417ec67df43454d851b10 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 06:10:00 +0000 Subject: [PATCH 135/176] discordchatexporter-cli: 2.35.2 -> 2.36 --- pkgs/tools/backup/discordchatexporter-cli/default.nix | 4 ++-- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index 14c8925a13dd..ba93488625e4 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.35.2"; + version = "2.36"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "OMJp5HL/fN5NGEgozaQefE503HwYnsGgTY4d4s15ANE="; + sha256 = "0PHTW1fo+bp2OwyNeUfBXMn+aVWQc4mc+T6BEzG/gDA="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index a276aa3bd57a..3eeae7e78824 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -7,8 +7,8 @@ (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.3.1"; sha256 = "0zsicyizachdam64mjm1brh5a3nzf7j8nalyhwnw26wk3v3rgmc9"; }) (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) - (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; }) - (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.1"; sha256 = "18qx0rzp4xz4ng9yc0c2bcpa4ky6sfiz10828y4j9ymywas7yzxw"; }) + (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.2"; sha256 = "11mxv1p7ahjzpf3sgacfx6szv1xwwk33vpz1r6wb2nch5dx93vdx"; }) + (fetchNuGet { pname = "MiniRazor.Runtime"; version = "2.2.2"; sha256 = "1bjnqx06gzc13kpbhyndzfrvwgmxi7j0nbaxm7cmb1g7zq06vzrb"; }) (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; }) (fetchNuGet { pname = "Spectre.Console"; version = "0.44.0"; sha256 = "0f4q52rmib0q3vg7ij6z73mnymyas7c7wrm8dfdhrkdzn53zwl6p"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) From 9e9a243aa9e56d5e3cd9cccc7b91b4de384e4af8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 06:29:20 +0000 Subject: [PATCH 136/176] enlightenment.efl: 1.26.2 -> 1.26.3 --- pkgs/desktops/enlightenment/efl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/enlightenment/efl/default.nix b/pkgs/desktops/enlightenment/efl/default.nix index 7c0832a07f44..0c47eec55f0a 100644 --- a/pkgs/desktops/enlightenment/efl/default.nix +++ b/pkgs/desktops/enlightenment/efl/default.nix @@ -56,11 +56,11 @@ stdenv.mkDerivation rec { pname = "efl"; - version = "1.26.2"; + version = "1.26.3"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "071h0pscbd8g341yy5rz9mk1xn8yhryldhl6mmr1y6lafaycyy99"; + sha256 = "sha256-2fg6oP2TNPRN7rTklS3A5RRGg6+seG/uvOYDCVFhfRU="; }; nativeBuildInputs = [ From cd93f6632c74bbf062511df10f58e5ad53e64bd5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 23:46:38 +0000 Subject: [PATCH 137/176] xsecurelock: 1.7.0 -> 1.8.0 --- pkgs/tools/X11/xsecurelock/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xsecurelock/default.nix b/pkgs/tools/X11/xsecurelock/default.nix index 9539a717e611..ab8bbf67ca66 100644 --- a/pkgs/tools/X11/xsecurelock/default.nix +++ b/pkgs/tools/X11/xsecurelock/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "xsecurelock"; - version = "1.7.0"; + version = "1.8.0"; src = fetchFromGitHub { owner = "google"; repo = "xsecurelock"; rev = "v${version}"; - sha256 = "020y2mi4sshc5dghcz37aj5wwizbg6712rzq2a72f8z8m7mnxr5y"; + sha256 = "sha256-sK3KrtZzrV2jkQveZnSHDR5I4v7baL/sARje2mDpIMI="; }; nativeBuildInputs = [ From 051c789c9b0c10c368d597135518afa88820ac30 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 08:47:34 +0000 Subject: [PATCH 138/176] circup: 1.1.2 -> 1.1.3 --- pkgs/development/tools/circup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/circup/default.nix b/pkgs/development/tools/circup/default.nix index 72874edd0c13..ccb7ef454aa3 100644 --- a/pkgs/development/tools/circup/default.nix +++ b/pkgs/development/tools/circup/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "circup"; - version = "1.1.2"; + version = "1.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = "adafruit"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-zrpld0yexzoXJx4qqDPEMf58SN67SGoP3umNqqsFJgw="; + hash = "sha256-BCAsCwQCKMtmjISMVKDblRdev87K4EfX5D2Ot0L5PoQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 1129316c97f2b84359463052739f987e6b0c63a1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 09:14:00 +0000 Subject: [PATCH 139/176] dtrx: 8.3.1 -> 8.4.0 --- pkgs/tools/compression/dtrx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/compression/dtrx/default.nix b/pkgs/tools/compression/dtrx/default.nix index 78c2a9f399c6..c99d40cbc92f 100644 --- a/pkgs/tools/compression/dtrx/default.nix +++ b/pkgs/tools/compression/dtrx/default.nix @@ -21,13 +21,13 @@ python3Packages.buildPythonApplication rec { pname = "dtrx"; - version = "8.3.1"; + version = "8.4.0"; src = fetchFromGitHub { owner = "dtrx-py"; repo = "dtrx"; rev = "refs/tags/${version}"; - sha256 = "sha256-a8ZHIPunWGwI992HfgdRvJGtDfYUP50kFt/ROAqDO7E="; + sha256 = "sha256-G+W0qY8s30cYSmOEy9Kkx+Wr48n7+6FuzL34GvwdKtg="; }; postInstall = From fd81c3de80d1c98a4fac76c701c90c6a9d35ddd7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 22:21:41 +0000 Subject: [PATCH 140/176] v2ray-geoip: 202209080101 -> 202209150105 --- pkgs/data/misc/v2ray-geoip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/misc/v2ray-geoip/default.nix b/pkgs/data/misc/v2ray-geoip/default.nix index 507f6059b768..f27c791d4cb8 100644 --- a/pkgs/data/misc/v2ray-geoip/default.nix +++ b/pkgs/data/misc/v2ray-geoip/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "v2ray-geoip"; - version = "202209080101"; + version = "202209150105"; src = fetchFromGitHub { owner = "v2fly"; repo = "geoip"; - rev = "2e77e5d149f0a8f9c284333b206d0f017b0b66ef"; - sha256 = "sha256-vkWRBSwLpCqZWMlfwOyPWn2MF+/lG+VXnSrDCSR+dak="; + rev = "6666b85fc48179414d59613cdfd6f83354f778bc"; + sha256 = "sha256-iBQvfVvfTG8zQdoTGOFxME0tr/YWCVxjXFQhP/zmRVU="; }; installPhase = '' From 5538b8f0cc4ada0625bb33de159a190fd52b4813 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 14:41:47 +0000 Subject: [PATCH 141/176] nanovna-saver: 0.5.2 -> 0.5.3 --- .../science/electronics/nanovna-saver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/nanovna-saver/default.nix b/pkgs/applications/science/electronics/nanovna-saver/default.nix index 817a3b1c0870..22950326e867 100644 --- a/pkgs/applications/science/electronics/nanovna-saver/default.nix +++ b/pkgs/applications/science/electronics/nanovna-saver/default.nix @@ -6,13 +6,13 @@ }: python3.pkgs.buildPythonApplication rec { pname = "nanovna-saver"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "NanoVNA-Saver"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-PP4VHEp6NSSLsuYABr0/S3+YuhpAyvh/xGnQGyszCtM="; + sha256 = "sha256-wKKjMcOx7NS2VAIk3OTAj7KWE1+CeAzctdgdidT+HMA="; }; nativeBuildInputs = [ wrapQtAppsHook ]; From 3fda0f64a9b78ae08f78e75e746f3dfcee6bc555 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 14:07:28 +0000 Subject: [PATCH 142/176] legendary-gl: 0.20.28 -> 0.20.29 --- pkgs/games/legendary-gl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/legendary-gl/default.nix b/pkgs/games/legendary-gl/default.nix index c04c90b97753..362788b441e1 100644 --- a/pkgs/games/legendary-gl/default.nix +++ b/pkgs/games/legendary-gl/default.nix @@ -7,13 +7,13 @@ buildPythonApplication rec { pname = "legendary-gl"; # Name in pypi - version = "0.20.28"; + version = "0.20.29"; src = fetchFromGitHub { owner = "derrod"; repo = "legendary"; rev = "refs/tags/${version}"; - sha256 = "sha256-33EsxwwvgkN9U8kpYywV0wsRnLzjGv87zYJ9jSVi91c="; + sha256 = "sha256-yocGjPZzuLHvWQ1EuS+kMxb/6ikfPvKqFmvHK+SyE+E="; }; propagatedBuildInputs = [ requests ]; From af69c8a3ad53b19813a6d5bca8973fd7b52b174d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 11:53:28 +0200 Subject: [PATCH 143/176] sx-go: remove line break --- pkgs/tools/security/sx-go/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/tools/security/sx-go/default.nix b/pkgs/tools/security/sx-go/default.nix index 626851b1824f..1df508386208 100644 --- a/pkgs/tools/security/sx-go/default.nix +++ b/pkgs/tools/security/sx-go/default.nix @@ -20,8 +20,7 @@ buildGoModule rec { vendorSha256 = "sha256-TWRMNt6x8zuvhP1nz4R6IVCX+9HityvVpzxRhDiMyO4="; patches = [ - # Fix darwin builds: - # https://github.com/v-byte-cpu/sx/pull/120 + # Fix darwin builds: https://github.com/v-byte-cpu/sx/pull/120 (fetchpatch { name = "non-linux-method-signature.patch"; url = "https://github.com/v-byte-cpu/sx/commit/56457bfaa49eb6fbb7a33d7092d9c636b9c85895.patch"; From 07d165f54853855fb006f5f9900725e239aa75ec Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 10:01:09 +0000 Subject: [PATCH 144/176] goda: 0.5.1 -> 0.5.2 --- pkgs/development/tools/goda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/goda/default.nix b/pkgs/development/tools/goda/default.nix index 43f78aa70693..0127773befe2 100644 --- a/pkgs/development/tools/goda/default.nix +++ b/pkgs/development/tools/goda/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goda"; - version = "0.5.1"; + version = "0.5.2"; src = fetchFromGitHub { owner = "loov"; repo = "goda"; rev = "v${version}"; - sha256 = "sha256-tXXUDeqGjv6T2eI/VJ+kwPKJLT7D1nO9BaKN5FHS34I="; + sha256 = "sha256-gXpO0DvxghyJIIxjE/KGjF/uRQ5W3p5QhqtmzeDmAfA="; }; vendorSha256 = "sha256-OyQEw6mRrRneo3T8wns0doU4lxJYEoilTd30xctLBJ4="; From f5fdbb3d96a30970c7fd97a732fbbb6ad8fe5543 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 06:47:01 +0000 Subject: [PATCH 145/176] argocd: 2.4.11 -> 2.4.12 --- pkgs/applications/networking/cluster/argocd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 509ee0aedd0d..84cc0ee0f09a 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "argocd"; - version = "2.4.11"; + version = "2.4.12"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - sha256 = "sha256-o4mDqLbGsrlpPNEBqsvIGpelL5IocHnFpRrvoLExGes="; + sha256 = "sha256-U3Qct7wL/oJDgU+PXL5UMMTsQo4maeKShDwU2crSWxk="; }; vendorSha256 = "sha256-n6elT6ETOtbZsFqfwMo9d2qqamS8jdrROjFjStNkalc="; From 2383d17fc2e15d79b3b298c9694eaac1cbc0f5f3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 10:22:34 +0000 Subject: [PATCH 146/176] rofimoji: 5.5.0 -> 5.6.0 --- pkgs/applications/misc/rofimoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/rofimoji/default.nix b/pkgs/applications/misc/rofimoji/default.nix index 44ce37c4564f..45b12bab89e3 100644 --- a/pkgs/applications/misc/rofimoji/default.nix +++ b/pkgs/applications/misc/rofimoji/default.nix @@ -15,14 +15,14 @@ buildPythonApplication rec { pname = "rofimoji"; - version = "5.5.0"; + version = "5.6.0"; format = "pyproject"; src = fetchFromGitHub { owner = "fdw"; repo = "rofimoji"; rev = "refs/tags/${version}"; - sha256 = "sha256-rYqEeAoHCx0j83R1vmtj+CVuR0QFEd3e1c5O454mANM="; + sha256 = "sha256-6W/59DjxrgejHSkNxpruDAws812Vjyf+GePDPbXzVbc="; }; # `rofi` and the `waylandSupport` and `x11Support` dependencies From 5dc2630125007bc3d08381aebbf09ea99ff4e747 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sat, 17 Sep 2022 06:34:48 -0400 Subject: [PATCH 147/176] scope-lite: init at 0.2.0 --- .../libraries/scope-lite/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/scope-lite/default.nix diff --git a/pkgs/development/libraries/scope-lite/default.nix b/pkgs/development/libraries/scope-lite/default.nix new file mode 100644 index 000000000000..40cad6a5fc3c --- /dev/null +++ b/pkgs/development/libraries/scope-lite/default.nix @@ -0,0 +1,22 @@ +{ stdenv, cmake, fetchFromGitHub, lib }: let + version = "0.2.0"; +in stdenv.mkDerivation { + name = "scope-lite-${version}"; + + src = fetchFromGitHub { + owner = "martinmoene"; + repo = "scope-lite"; + rev = "v${version}"; + hash = "sha256-/Vu3blgyEOQRFqhQjuT/6ukV0iWA0TdPrLnt2Z/gd6E="; + }; + + nativeBuildInputs = [ cmake ]; + + meta = { + description = "A migration path to C++ library extensions scope_exit, scope_fail, scope_success, unique_resource"; + license = lib.licenses.boost; + maintainers = [ lib.maintainers.shlevy ]; + homepage = "https://github.com/martinmoene/scope-lite"; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 281b0fd328dd..b4b9d68e5ca4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20400,6 +20400,8 @@ with pkgs; autoreconfHook = buildPackages.autoreconfHook269; }; + scope-lite = callPackage ../development/libraries/scope-lite { }; + SDL = callPackage ../development/libraries/SDL ({ inherit (darwin.apple_sdk.frameworks) OpenGL CoreAudio CoreServices AudioUnit Kernel Cocoa GLUT; } // lib.optionalAttrs stdenv.hostPlatform.isAndroid { From 942a922bb8955786215bf7462d0589324bf60365 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 10:36:37 +0000 Subject: [PATCH 148/176] ctlptl: 0.8.7 -> 0.8.8 --- pkgs/development/tools/ctlptl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ctlptl/default.nix b/pkgs/development/tools/ctlptl/default.nix index 4b0aa6b6bbcc..972c40716798 100644 --- a/pkgs/development/tools/ctlptl/default.nix +++ b/pkgs/development/tools/ctlptl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ctlptl"; - version = "0.8.7"; + version = "0.8.8"; src = fetchFromGitHub { owner = "tilt-dev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-cSgsEjOnaFUuf9Vf6UOCC7LsmVg47wEQKU0LxpngLYc="; + sha256 = "sha256-OuLA8Yq0ihvj4wCQxQ/GqN85KW8Cj5eTWN+UZ52T0DU="; }; vendorSha256 = "sha256-M9B/rfMBjYJb9szmYPVZqURlcv62qHOLJ3ka0v++z0s="; From 73b1c42875d1387783bdba8c2024c2a964790163 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 02:08:09 +0000 Subject: [PATCH 149/176] protoc-gen-validate: 0.6.7 -> 0.6.8 --- pkgs/development/tools/protoc-gen-validate/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/protoc-gen-validate/default.nix b/pkgs/development/tools/protoc-gen-validate/default.nix index 9a77437a3723..c91ce0f3379e 100644 --- a/pkgs/development/tools/protoc-gen-validate/default.nix +++ b/pkgs/development/tools/protoc-gen-validate/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "protoc-gen-validate"; - version = "0.6.7"; + version = "0.6.8"; src = fetchFromGitHub { owner = "envoyproxy"; repo = "protoc-gen-validate"; rev = "v${version}"; - sha256 = "sha256-ouo6raNbvQyuY4IY1JEN45Ss7zb3EoR/WIRzL7hXLNI="; + sha256 = "sha256-s66HfafyiAwr4tvWiPVj7ivWE9C03KTGgI/iu0LgNGk="; }; - vendorSha256 = "sha256-HbUEhoB6PPHwN/xym6dTkS54+EqVU1n8EIym8W2wt3I="; + vendorSha256 = "sha256-vFi1DT7o2fyzxO/aZHtdsU1/G/sGmamqZPeql0vQVjs="; excludedPackages = [ "tests" ]; From 069eed261158f7f3b3e90dd353aa7ad0f98dba03 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 00:05:38 +0000 Subject: [PATCH 150/176] okteto: 2.6.0 -> 2.7.0 --- pkgs/development/tools/okteto/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/okteto/default.nix b/pkgs/development/tools/okteto/default.nix index 093282517117..efd8a077855d 100644 --- a/pkgs/development/tools/okteto/default.nix +++ b/pkgs/development/tools/okteto/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "okteto"; - version = "2.6.0"; + version = "2.7.0"; src = fetchFromGitHub { owner = "okteto"; repo = "okteto"; rev = version; - sha256 = "sha256-leJvrbtKTtHins46YbPm7kTpcFTC5l2idOXEz+oPeZE="; + sha256 = "sha256-xAK2gxIMyiC3GEd4As5FrGQqa4f+FiQLZZs4VROSpgQ="; }; vendorSha256 = "sha256-Na0t9uxmA7lIRTRp6I+eDHjUbo7YQzbMQfqDZd6T62k="; From 5af43b5f78e20ebd5d6da5d315eed2620007966d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 13:14:12 +0200 Subject: [PATCH 151/176] python310Packages.furo: update disabled --- pkgs/development/python-modules/furo/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/furo/default.nix b/pkgs/development/python-modules/furo/default.nix index 5378a1e9739b..e8797e8ab4db 100644 --- a/pkgs/development/python-modules/furo/default.nix +++ b/pkgs/development/python-modules/furo/default.nix @@ -11,13 +11,14 @@ buildPythonPackage rec { pname = "furo"; version = "2022.9.15"; format = "wheel"; - disable = pythonOlder "3.6"; + + disable = pythonOlder "3.7"; src = fetchPypi { inherit pname version format; dist = "py3"; python = "py3"; - sha256 = "sha256-kSnerR916ftPpAdhLx1aDQMgdn5hVsklqv4282L5sRo="; + hash = "sha256-kSnerR916ftPpAdhLx1aDQMgdn5hVsklqv4282L5sRo="; }; propagatedBuildInputs = [ @@ -37,7 +38,9 @@ buildPythonPackage rec { cd - ''; - pythonImportsCheck = [ "furo" ]; + pythonImportsCheck = [ + "furo" + ]; meta = with lib; { description = "A clean customizable documentation theme for Sphinx"; From 6ba6ece4c309e448dd5b301db44488dad8ba782f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 23:16:43 +0000 Subject: [PATCH 152/176] mutagen-compose: 0.15.2 -> 0.15.3 --- pkgs/tools/misc/mutagen-compose/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mutagen-compose/default.nix b/pkgs/tools/misc/mutagen-compose/default.nix index f9bf6c9a18e3..c22d2450eead 100644 --- a/pkgs/tools/misc/mutagen-compose/default.nix +++ b/pkgs/tools/misc/mutagen-compose/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "mutagen-compose"; - version = "0.15.2"; + version = "0.15.3"; src = fetchFromGitHub { owner = "mutagen-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Ass6BXOevFuyT6eLZ8J5XRN44YAfBdoQ7N+/5152uR0="; + sha256 = "sha256-B7ZMECeNYIfFQ7+VM+tBLj6KLCxicNfopXzL7AtrSFc="; }; - vendorSha256 = "sha256-rzMcUQvP27GBGohcWrSzu7fEP6lwEwgo3sWXuEeZES8="; + vendorSha256 = "sha256-AfOsnD3e2C2c/Qc26IlP9CeaoSAhP78Nupu245ma1Z0="; doCheck = false; From 12cefaaa665aa36a02d3aa51e4b811b56386d470 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 03:50:47 +0000 Subject: [PATCH 153/176] skeema: 1.8.1 -> 1.8.2 --- pkgs/tools/system/skeema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/skeema/default.nix b/pkgs/tools/system/skeema/default.nix index 2bffcf200959..7ee2ff0bf717 100644 --- a/pkgs/tools/system/skeema/default.nix +++ b/pkgs/tools/system/skeema/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "skeema"; - version = "1.8.1"; + version = "1.8.2"; src = fetchFromGitHub { owner = "skeema"; repo = "skeema"; rev = "v${version}"; - sha256 = "sha256-1XK4eXRVUkCPx5MULmHx5mwQ5P1aqZNtHNEqCBMK8NE="; + sha256 = "sha256-PyQ5nLoJl3N/ewmHTZZHRLj9WV3EsUjL6fyESc8POss="; }; vendorSha256 = null; From 681a8f27d3c6ce24f82a4cd792cd08750eb77c63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 02:36:26 +0000 Subject: [PATCH 154/176] rekor-cli: 0.11.0 -> 0.12.0 --- pkgs/tools/security/rekor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/rekor/default.nix b/pkgs/tools/security/rekor/default.nix index 44b47dc6568b..1b335c31b472 100644 --- a/pkgs/tools/security/rekor/default.nix +++ b/pkgs/tools/security/rekor/default.nix @@ -4,13 +4,13 @@ let generic = { pname, packageToBuild, description }: buildGoModule rec { inherit pname; - version = "0.11.0"; + version = "0.12.0"; src = fetchFromGitHub { owner = "sigstore"; repo = "rekor"; rev = "v${version}"; - sha256 = "sha256-55socfx7qTQ3F5JcDgPTHQP+96X7lwFJ8IIz52hFxow="; + sha256 = "sha256-XMudPMCy9AKpqMmt+iH+xyB08s83B/Q0G8PC/4l7llo="; # populate values that require us to use git. By doing this in postFetch we # can delete .git afterwards and maintain better reproducibility of the src. leaveDotGit = true; @@ -23,7 +23,7 @@ let ''; }; - vendorSha256 = "sha256-A3fG756BoUSJwxyGdfpJlbb+nVQgzo39mjT+QD4knlk="; + vendorSha256 = "sha256-cNe3lp866VTeL81FXKVG910ZmO2jrGIZowPRRMFc0bQ="; nativeBuildInputs = [ installShellFiles ]; From ea0f60ebe03dca226dad6aaabb315e98b987ef6a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 14:32:58 +0200 Subject: [PATCH 155/176] python310Packages.tilt-ble: 0.2.3 -> 0.2.3 --- pkgs/development/python-modules/tilt-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/tilt-ble/default.nix b/pkgs/development/python-modules/tilt-ble/default.nix index e7fd0e0368b9..a663ba8429ac 100644 --- a/pkgs/development/python-modules/tilt-ble/default.nix +++ b/pkgs/development/python-modules/tilt-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "tilt-ble"; - version = "0.2.2"; + version = "0.2.3"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "Bluetooth-Devices"; repo = pname; rev = "v${version}"; - hash = "sha256-inr2cPl627w2klSqScMg3dvofIkX3hGb44+Go6ah/6I="; + hash = "sha256-PR+BA0wUljUeUYCTRMKxkG+kj6PfklksbO/k9L7sWdE="; }; nativeBuildInputs = [ From 7f059c03dd7568ffba0c5b882c653ed7fae7b647 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 16 Sep 2022 02:26:39 +0000 Subject: [PATCH 156/176] railway: 2.0.10 -> 2.0.11 --- pkgs/development/tools/railway/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/railway/default.nix b/pkgs/development/tools/railway/default.nix index 202dda25ea2a..7e42d4616bb5 100644 --- a/pkgs/development/tools/railway/default.nix +++ b/pkgs/development/tools/railway/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "railway"; - version = "2.0.10"; + version = "2.0.11"; src = fetchFromGitHub { owner = "railwayapp"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-g/QBsWWVjhmn5slNav7j+vrzwf/0mMAERJaDLRrbxGI="; + sha256 = "sha256-A8bfs8GgpsuX3QlJsjUWhgh0zXX0+HULRBQSY+lkXuE="; }; ldflags = [ "-s" "-w" ]; From 7369283be45b7a568185b4b732eb4b0c920e186a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 14:45:46 +0200 Subject: [PATCH 157/176] python310Packages.aiosmtplib: 1.1.6 -> 1.1.7 --- .../python-modules/aiosmtplib/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/aiosmtplib/default.nix b/pkgs/development/python-modules/aiosmtplib/default.nix index a3a2e8295a0d..d54718d77efa 100644 --- a/pkgs/development/python-modules/aiosmtplib/default.nix +++ b/pkgs/development/python-modules/aiosmtplib/default.nix @@ -2,7 +2,6 @@ , aiosmtpd , buildPythonPackage , fetchFromGitHub -, fetchpatch , hypothesis , poetry-core , pytest-asyncio @@ -12,7 +11,7 @@ buildPythonPackage rec { pname = "aiosmtplib"; - version = "1.1.6"; + version = "1.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +20,7 @@ buildPythonPackage rec { owner = "cole"; repo = pname; rev = "v${version}"; - hash = "sha256-bo+u3I+ZX95UYkEam2TB6d6rvbYKa5Qu/9oNX5le478="; + hash = "sha256-ZVNYMVg2qeMoSojmPllvJLv2Xm5IYN9h5N13oHPFXSk="; }; nativeBuildInputs = [ @@ -35,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/cole/aiosmtplib/pull/183 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/cole/aiosmtplib/commit/3aba1c132d9454e05d4281f4c8aa618b4e1b783d.patch"; - hash = "sha256-KlA46gD6swfJ/3OLO3xWZWa66Gx1/izmUMQ60PQy0po="; - }) - ]; - pythonImportsCheck = [ "aiosmtplib" ]; From 0cfb3c002b61807ca0bab3efe514476bdf2e5478 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 22:58:29 +0000 Subject: [PATCH 158/176] mongodb-compass: 1.33.0 -> 1.33.1 --- pkgs/tools/misc/mongodb-compass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/mongodb-compass/default.nix b/pkgs/tools/misc/mongodb-compass/default.nix index b9e91d4e9efe..d946a1918008 100644 --- a/pkgs/tools/misc/mongodb-compass/default.nix +++ b/pkgs/tools/misc/mongodb-compass/default.nix @@ -33,7 +33,7 @@ xorg, }: let - version = "1.33.0"; + version = "1.33.1"; rpath = lib.makeLibraryPath [ alsa-lib @@ -82,7 +82,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-P5QNSFaE04YP+zOPWKE5Rf6vffhcBwNdju7aTTnDbJ0="; + sha256 = "sha256-Db3Xv6kNAPWqeM+vZeG7GieweaThJO0CCuwm6/v4l2s="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; From 854a94aa19cea0d419c4b616c2be9d0243b91393 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 22:43:44 +0000 Subject: [PATCH 159/176] mlkit: 4.6.1 -> 4.7.1 --- pkgs/development/compilers/mlkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/mlkit/default.nix b/pkgs/development/compilers/mlkit/default.nix index eb2866629721..9e462fac0924 100644 --- a/pkgs/development/compilers/mlkit/default.nix +++ b/pkgs/development/compilers/mlkit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mlkit"; - version = "4.6.1"; + version = "4.7.1"; src = fetchFromGitHub { owner = "melsman"; repo = "mlkit"; rev = "v${version}"; - sha256 = "sha256-04G9G14fhEh8wwgqHwUR+sbYU3zaZcFV0q5SoAKcyjY="; + sha256 = "sha256-7fxyXibq17ikrqhqMj4pnLerBOvkY/7ses4Kjw2GdOY="; }; nativeBuildInputs = [ autoreconfHook mlton ]; From ec3b39d5d4b0c74a706b947f3a8f3d34644c9a44 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 17 Sep 2022 14:56:19 +0200 Subject: [PATCH 160/176] python310Packages.qingping-ble: 0.6.1 -> 0.7.0 --- pkgs/development/python-modules/qingping-ble/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/qingping-ble/default.nix b/pkgs/development/python-modules/qingping-ble/default.nix index f7d40426d563..ca1aaa8e8c20 100644 --- a/pkgs/development/python-modules/qingping-ble/default.nix +++ b/pkgs/development/python-modules/qingping-ble/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "qingping-ble"; - version = "0.6.1"; + version = "0.7.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "bluetooth-devices"; repo = pname; rev = "v${version}"; - hash = "sha256-0fa5KocDyy3JL7gohbbBghXwbCzbcjK4pVM+zckboHc="; + hash = "sha256-DBkwi++gmyd8/hAMSO+Ktsou1FtcbfoY8PR+c43MOXw="; }; nativeBuildInputs = [ From 68c1cfa988363da564cfbb1e2b2aa772f3be02fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 11:20:52 +0000 Subject: [PATCH 161/176] solaar: 1.1.4 -> 1.1.5 --- pkgs/applications/misc/solaar/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/solaar/default.nix b/pkgs/applications/misc/solaar/default.nix index 3d750d8b0fd6..6a40f13034e7 100644 --- a/pkgs/applications/misc/solaar/default.nix +++ b/pkgs/applications/misc/solaar/default.nix @@ -14,13 +14,13 @@ # instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.4"; + version = "1.1.5"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; - rev = version; - hash = "sha256-nDfVF7g0M54DRpkH1rnZB8o+nCV4A6b1uKMOMRQ3GbI="; + rev = "refs/tags/${version}"; + hash = "sha256-wqSDSLzm2RYV7XZPX0GQDR+TUgj4hLJ9FpVP3DYN7To="; }; outputs = [ "out" "udev" ]; From fb2a9c8fe4d2743042bc58139409ad4fddd92f11 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 13:32:38 +0000 Subject: [PATCH 162/176] gitls: 1.0.3 -> 1.0.4 --- pkgs/tools/security/gitls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/gitls/default.nix b/pkgs/tools/security/gitls/default.nix index f6ef854ce810..4cda10b38057 100644 --- a/pkgs/tools/security/gitls/default.nix +++ b/pkgs/tools/security/gitls/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "gitls"; - version = "1.0.3"; + version = "1.0.4"; src = fetchFromGitHub { owner = "hahwul"; repo = pname; rev = "v${version}"; - hash = "sha256-snoWnq+xmaxWzFthhO/gOYQDUMbpIZR9VkqcPaHzS6g="; + hash = "sha256-kLkH/nNidd1QNPKvo7fxZwMhTgd4AVB8Ofw0Wo0z6c0="; }; - vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + vendorSha256 = null; passthru.tests.version = testers.testVersion { package = gitls; From 49ba5a30a10424948cf995ad62ed497b468f0c51 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 13:35:38 +0000 Subject: [PATCH 163/176] glooctl: 1.12.17 -> 1.12.18 --- pkgs/applications/networking/cluster/glooctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index bde95292141e..fd12aa33190d 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "glooctl"; - version = "1.12.17"; + version = "1.12.18"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-6lwjfJOW1T+pRU9nrZ9Pit0N0je+t829jeKmlDn9TgA="; + hash = "sha256-FzJxYbDo0bVMHLo3XBCciS/N4Jx87tDP8SQttWNqkUc="; }; subPackages = [ "projects/gloo/cli/cmd" ]; From b02d6e3754f2a6ed61114d62aa0a2d8d52eab493 Mon Sep 17 00:00:00 2001 From: amesgen Date: Sat, 17 Sep 2022 16:22:02 +0200 Subject: [PATCH 164/176] latte-integrale: init at 1.7.6 (#190683) Co-authored-by: Sandro --- .../science/math/latte-integrale/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/libraries/science/math/latte-integrale/default.nix diff --git a/pkgs/development/libraries/science/math/latte-integrale/default.nix b/pkgs/development/libraries/science/math/latte-integrale/default.nix new file mode 100644 index 000000000000..7eb485974ff2 --- /dev/null +++ b/pkgs/development/libraries/science/math/latte-integrale/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, gmp +, ntl +, cddlib +}: + +stdenv.mkDerivation (finalAttrs: { + pname = "latte-integrale"; + version = "1.7.6"; + + src = fetchurl { + url = "https://github.com/latte-int/latte/releases/download/version_${lib.replaceStrings ["."] ["_"] finalAttrs.version}/latte-int-${finalAttrs.version}.tar.gz"; + sha256 = "sha256-AGwQ6+XVv9ybFZy6YmSkQyhh/nY84F/oIWJKt9P8IXA="; + }; + + patches = [ + # C++17 compat + (fetchpatch { + url = "https://github.com/latte-int/latte/commit/6dbf7f07d5c9e1f3afe793f782d191d4465088ae.patch"; + excludes = [ "code/latte/sqlite/IntegrationDB.h" ]; + sha256 = "sha256-i7c11y54OLuJ0m7PBnhEoAzJzxC842JU7A6TOtTz06k="; + }) + ]; + + buildInputs = [ + gmp + ntl + cddlib + ]; + + meta = { + description = "Software for counting lattice points and integration over convex polytopes"; + homepage = "https://www.math.ucdavis.edu/~latte/"; + license = lib.licenses.gpl2; + maintainers = with lib.maintainers; [ amesgen ]; + platforms = lib.platforms.unix; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7829c35c2da9..519144426cbf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34689,6 +34689,8 @@ with pkgs; rankwidth = callPackage ../development/libraries/science/math/rankwidth { }; + latte-integrale = callPackage ../development/libraries/science/math/latte-integrale { }; + lcalc = callPackage ../development/libraries/science/math/lcalc { }; lrcalc = callPackage ../applications/science/math/lrcalc { }; From 1601abe66a9a2e78a3b078e41cd604910e2d763e Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Sat, 17 Sep 2022 16:41:38 +0200 Subject: [PATCH 165/176] pinniped: make binary smaller and enable shell completions --- .../networking/cluster/pinniped/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/pinniped/default.nix b/pkgs/applications/networking/cluster/pinniped/default.nix index 9ee8109a94e3..61bb2000e136 100644 --- a/pkgs/applications/networking/cluster/pinniped/default.nix +++ b/pkgs/applications/networking/cluster/pinniped/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, buildGoModule }: +{ lib, fetchFromGitHub, buildGoModule, installShellFiles }: buildGoModule rec{ pname = "pinniped"; @@ -15,6 +15,17 @@ buildGoModule rec{ vendorSha256 = "sha256-8ohyyciL1ORYOxPu64W0jXASTv+vVZR8StutzbF9N4Y="; + ldflags = [ "-s" "-w" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd pinniped \ + --bash <($out/bin/pinniped completion bash) \ + --fish <($out/bin/pinniped completion fish) \ + --zsh <($out/bin/pinniped completion zsh) + ''; + meta = with lib; { description = "Tool to securely log in to your Kubernetes clusters"; homepage = "https://pinniped.dev/"; From 091a5c32e468b8b0a82a4eb9a79a05ff4a2f3d2a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 23:23:56 +0000 Subject: [PATCH 166/176] netbird: 0.9.1 -> 0.9.3 --- pkgs/tools/networking/netbird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/netbird/default.nix b/pkgs/tools/networking/netbird/default.nix index b90e2b92169d..60f9a19bd534 100644 --- a/pkgs/tools/networking/netbird/default.nix +++ b/pkgs/tools/networking/netbird/default.nix @@ -14,13 +14,13 @@ let in buildGoModule rec { pname = "netbird"; - version = "0.9.1"; + version = "0.9.3"; src = fetchFromGitHub { owner = "netbirdio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ECQ9W4YJdqjFP/Fs2P/JlPLJntewi1kowzYyid7IQGc="; + sha256 = "sha256-lW5Xaf1d0udm8yLzGhmCmd13SYHdbIBi/bjuiRAdjRg="; }; vendorSha256 = "sha256-qBglJ9PYUApyOrZhZRvyK3WMcZQglDHmsy3Qv5K1PqA="; From 0c0044eae7040abd70edb9e08e1646786a0397fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 15:37:40 +0000 Subject: [PATCH 167/176] mage: 1.13.0 -> 1.14.0 --- pkgs/development/tools/build-managers/mage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/mage/default.nix b/pkgs/development/tools/build-managers/mage/default.nix index 77141a69beb2..d9664922867b 100644 --- a/pkgs/development/tools/build-managers/mage/default.nix +++ b/pkgs/development/tools/build-managers/mage/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "mage"; - version = "1.13.0"; + version = "1.14.0"; src = fetchFromGitHub { owner = "magefile"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+OhmV5+XNhJVCVYNKc6M5bNB4gyb/SV6bEohaZJXtLk="; + sha256 = "sha256-77RjA5gncKE3fhejlmA+Vkhud4nyaRZW84I3cYTk0Js="; }; vendorSha256 = null; From ad5a3928bf04c9058b672df23137ecfa7b303233 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 04:26:34 +0000 Subject: [PATCH 168/176] cpm: 0.35.5 -> 0.35.6 --- pkgs/development/tools/cpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/cpm/default.nix b/pkgs/development/tools/cpm/default.nix index 37dc222707b0..4221b688d53a 100644 --- a/pkgs/development/tools/cpm/default.nix +++ b/pkgs/development/tools/cpm/default.nix @@ -5,11 +5,11 @@ stdenvNoCC.mkDerivation rec { pname = "cpm"; - version = "0.35.5"; + version = "0.35.6"; src = fetchurl { url = "https://github.com/cpm-cmake/CPM.cmake/releases/download/v${version}/CPM.cmake"; - sha256 = "sha256-JWfIptbRExSQQvcxx2bS1k5cudPpQPdyj90aZdbcROk="; + sha256 = "sha256-a0fiqUtpxZrNpVZ0Aa/GesU+mpW/kM/U8el5LE2OyBU="; }; dontUnpack = true; From 4f14788d2051141921e5b39c81159c6a24f5564b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 17 Sep 2022 15:45:49 +0000 Subject: [PATCH 169/176] python310Packages.atlassian-python-api: 3.28.0 -> 3.28.1 --- .../python-modules/atlassian-python-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/atlassian-python-api/default.nix b/pkgs/development/python-modules/atlassian-python-api/default.nix index 31395ad78827..a0c006261629 100755 --- a/pkgs/development/python-modules/atlassian-python-api/default.nix +++ b/pkgs/development/python-modules/atlassian-python-api/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "atlassian-python-api"; - version = "3.28.0"; + version = "3.28.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "atlassian-api"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-a0c/IOy14Pq8IEUKNyOh0/Z/ERGfeeI5aXFL/WpLUxE="; + sha256 = "sha256-ZKRmjfH3s35DU1Mut63YuN6opKzg2gpyunWYjg/FbHA="; }; propagatedBuildInputs = [ From 6b6bb7cdd37a4e0aee9d2ef873906832eb461640 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 17 Sep 2022 17:46:20 +0200 Subject: [PATCH 170/176] nixos/wiki-js: pin nodejs to v16 v18 is not supported, see https://docs.requarks.io/install/requirements#nodejs --- nixos/modules/services/web-apps/wiki-js.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/wiki-js.nix b/nixos/modules/services/web-apps/wiki-js.nix index 9cdbe989a353..c5627a28b849 100644 --- a/nixos/modules/services/web-apps/wiki-js.nix +++ b/nixos/modules/services/web-apps/wiki-js.nix @@ -127,7 +127,7 @@ in { WorkingDirectory = "/var/lib/${cfg.stateDirectoryName}"; DynamicUser = true; PrivateTmp = true; - ExecStart = "${pkgs.nodejs}/bin/node ${pkgs.wiki-js}/server"; + ExecStart = "${pkgs.nodejs-16_x}/bin/node ${pkgs.wiki-js}/server"; }; }; }; From 97daf5da8a4e8611f3cb17d5406da3c423f812e2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 15 Sep 2022 15:50:00 +0000 Subject: [PATCH 171/176] datree: 1.6.19 -> 1.6.29 --- pkgs/development/tools/datree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/datree/default.nix b/pkgs/development/tools/datree/default.nix index 9aaa787b3c2a..85d530f92510 100644 --- a/pkgs/development/tools/datree/default.nix +++ b/pkgs/development/tools/datree/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "datree"; - version = "1.6.19"; + version = "1.6.29"; src = fetchFromGitHub { owner = "datreeio"; repo = "datree"; rev = version; - hash = "sha256-cR01/IzbrD2ergJUH3XSKTGLcDuzXuOoKEvnwD2K6hs="; + hash = "sha256-RFm7I9HTI3M0fdGOz4ZXHtQY4Pm86SOz9pcIQLqb7/U="; }; vendorSha256 = "sha256-mEtnZO4AZEcnEHuiAWguT8VelD0yLj1rytl6gPkPKBg="; From 98b1b8daa78557091cf85a108c5b5fbd21863a44 Mon Sep 17 00:00:00 2001 From: figsoda Date: Sat, 17 Sep 2022 12:59:08 -0400 Subject: [PATCH 172/176] selene: 0.20.0 -> 0.21.0 --- pkgs/development/tools/selene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index d9a2782f3368..235689d97e21 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.20.0"; + version = "0.21.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-ScO2ih+Y8R1OrazSmLlz9QtTUjQ6tIPf5F5juj2nc7Y="; + sha256 = "sha256-iqPQD0oDPhhD7jgnbiJvUiaxj1YZeGkgQu6p1vr1Vlw="; }; - cargoSha256 = "sha256-pJZrNjgtYjribIKo4DWR47dnyoSuy9sSRPd+ginDlOU="; + cargoSha256 = "sha256-gl4vgS/164eYP3MWRBaI3NrmlqbYZUHOwySUA7/42Qg="; nativeBuildInputs = lib.optional robloxSupport pkg-config; From 9c35dd41c98e63ba1e59d1e8dfb45cc6b4ddc751 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 17 Sep 2022 19:05:06 +0200 Subject: [PATCH 173/176] grafana: 9.1.4 -> 9.1.5 ChangeLog: https://github.com/grafana/grafana/releases/tag/v9.1.5 --- pkgs/servers/monitoring/grafana/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 45a3cbba163e..8b927aaab707 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.4"; + version = "9.1.5"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-tMU8xfMbXdPpI8La036tzPozdUK7GsDGZklNetAZ3ho="; + sha256 = "sha256-R5gHd9lLXPV6Ck9mhPfdL41/O9ZN76wjBRDUBLtL2eA="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-+9Y2ymdlDfSvAsbaFcaTRl7e9NiH2GpNHvZIgssi7/w="; + sha256 = "sha256-P+QkpyGRSuZX/OJo/CgMP9z1Rq7tJbWAZCMOwAuEFhc="; }; vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; From 162d4bf69f2a75369e32d73ce6e0d2d2e9d6b7f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Wed, 7 Sep 2022 13:43:43 +0200 Subject: [PATCH 174/176] mautrix-signal: Use `--prefix` instead of `--set` in wrapper. Otherwise, options like `systemd.services..path` have no effect. An example for this being necessary is to add `ffmpeg` to the path of a service running `mautrix-signal` in order to decode audio messages. In general, package wrappers should not make environment variables like PATH or PYTHONPATH non-overridable. --- pkgs/servers/mautrix-signal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mautrix-signal/default.nix b/pkgs/servers/mautrix-signal/default.nix index 4879e6899517..056d2047f2d6 100644 --- a/pkgs/servers/mautrix-signal/default.nix +++ b/pkgs/servers/mautrix-signal/default.nix @@ -47,8 +47,8 @@ python3.pkgs.buildPythonPackage rec { " > $out/bin/mautrix-signal chmod +x $out/bin/mautrix-signal wrapProgram $out/bin/mautrix-signal \ - --set PATH ${python3}/bin \ - --set PYTHONPATH "$PYTHONPATH" + --prefix PATH : "${python3}/bin" \ + --prefix PYTHONPATH : "$PYTHONPATH" ''; meta = with lib; { From ff44e1f9dd2631be621d32b7ec9fa16ef2ae8e84 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Thu, 15 Sep 2022 11:10:29 -0500 Subject: [PATCH 175/176] resholve: use originalSrc for nixpkgs-update bot Effort to fix automatic nixpkgs-update updates for resholved packages in 9f6310d did help the bot get further, but it then failed to find the source outputHash (the outer derivation's source is the inner derivation; bot looks for outer.src.outputHash; ours is at outer.src.src.outputHash). This change uses `originalSrc` to indicate the source of the inner derivation. Along with ryantm/nixpkgs-update#324, this enables the bot to fall back on an attr that Nix/nixpkgs are not directly depending on, supporting automatic updates for packages built with `resholve.mkDerivation`. --- pkgs/development/misc/resholve/resholve-utils.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/misc/resholve/resholve-utils.nix b/pkgs/development/misc/resholve/resholve-utils.nix index 132f280a80e0..26bf492d23ab 100644 --- a/pkgs/development/misc/resholve/resholve-utils.nix +++ b/pkgs/development/misc/resholve/resholve-utils.nix @@ -185,6 +185,8 @@ rec { # retain a reference to the base passthru = unresholved.passthru // { unresholved = unresholved; + # fallback attr for update bot to query our src + originalSrc = unresholved.src; }; # do these imply that we should use NoCC or something? From a7a94811e3eed46aee7c8f8644a2a3737e59bddd Mon Sep 17 00:00:00 2001 From: Jairo Llopis Date: Wed, 27 Jul 2022 08:51:05 +0100 Subject: [PATCH 176/176] nixos/nix-daemon: support machine protocol Make ssh-ng:// users happier. @moduon MT-904 --- nixos/modules/services/misc/nix-daemon.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index e8d2bccdbf93..bd5991448957 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -227,6 +227,16 @@ in The hostname of the build machine. ''; }; + protocol = mkOption { + type = types.enum [ "ssh" "ssh-ng" ]; + default = "ssh"; + example = "ssh-ng"; + description = lib.mdDoc '' + The protocol used for communicating with the build machine. + Use `ssh-ng` if your remote builder and your + local Nix version support that improved protocol. + ''; + }; system = mkOption { type = types.nullOr types.str; default = null; @@ -670,7 +680,7 @@ in concatMapStrings (machine: (concatStringsSep " " ([ - "${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" + "${machine.protocol}://${optionalString (machine.sshUser != null) "${machine.sshUser}@"}${machine.hostName}" (if machine.system != null then machine.system else if machine.systems != [ ] then concatStringsSep "," machine.systems else "-") (if machine.sshKey != null then machine.sshKey else "-") (toString machine.maxJobs)