From 88527c2e3175f10337ac2cefda6a3737c44daa46 Mon Sep 17 00:00:00 2001 From: linsui Date: Wed, 9 Nov 2022 20:24:04 +0800 Subject: [PATCH 01/49] element-web: export element-web-unwrapped --- .../element/element-web-wrapper.nix | 26 ++++ .../element/element-web.nix | 136 ++++++++---------- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 87 insertions(+), 81 deletions(-) create mode 100644 pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix diff --git a/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix new file mode 100644 index 000000000000..c9a143ecb49e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/element/element-web-wrapper.nix @@ -0,0 +1,26 @@ +{ stdenv +, jq +, element-web-unwrapped +, conf ? { } +}: + +if (conf == { }) then element-web-unwrapped else +stdenv.mkDerivation rec { + pname = "${element-web-unwrapped.pname}-wrapped"; + inherit (element-web-unwrapped) version meta; + + dontUnpack = true; + + nativeBuildInputs = [ jq ]; + + installPhase = '' + runHook preInstall + + mkdir -p $out + ln -s ${element-web-unwrapped}/* $out + rm $out/config.json + jq -s '.[0] * $conf' "${element-web-unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + + runHook postInstall + ''; +} diff --git a/pkgs/applications/networking/instant-messengers/element/element-web.nix b/pkgs/applications/networking/instant-messengers/element/element-web.nix index 864c70f1917b..65a64ad0a31e 100644 --- a/pkgs/applications/networking/instant-messengers/element/element-web.nix +++ b/pkgs/applications/networking/instant-messengers/element/element-web.nix @@ -9,7 +9,6 @@ , fixup_yarn_lock , nodejs , jitsi-meet -, conf ? { } }: let @@ -18,93 +17,72 @@ let disable_guests = true; # disable automatic guest account registration at matrix.org piwik = false; # disable analytics }; - - unwrapped = stdenv.mkDerivation rec { - pname = "element-web"; - inherit (pinData) version; - - src = fetchFromGitHub { - owner = "vector-im"; - repo = pname; - rev = "v${version}"; - sha256 = pinData.webSrcHash; - }; - - offlineCache = fetchYarnDeps { - yarnLock = src + "/yarn.lock"; - sha256 = pinData.webYarnHash; - }; - - nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; - - configurePhase = '' - runHook preConfigure - - export HOME=$PWD/tmp - # with the update of openssl3, some key ciphers are not supported anymore - # this flag will allow those codecs again as a workaround - # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 - # and https://github.com/vector-im/element-web/issues/21043 - export NODE_OPTIONS=--openssl-legacy-provider - mkdir -p $HOME - - fixup_yarn_lock yarn.lock - yarn config --offline set yarn-offline-mirror $offlineCache - yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive - patchShebangs node_modules - - runHook postConfigure - ''; - - buildPhase = '' - runHook preBuild - - export VERSION=${version} - yarn build:res --offline - yarn build:module_system --offline - yarn build:bundle --offline - - runHook postBuild - ''; - - installPhase = '' - runHook preInstall - - cp -R webapp $out - cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js - echo "${version}" > "$out/version" - jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" - - runHook postInstall - ''; - - meta = { - description = "A glossy Matrix collaboration client for the web"; - homepage = "https://element.io/"; - changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; - maintainers = lib.teams.matrix.members; - license = lib.licenses.asl20; - platforms = lib.platforms.all; - }; - }; in -if (conf == { }) then unwrapped else stdenv.mkDerivation rec { - pname = "${unwrapped.pname}-wrapped"; - inherit (unwrapped) version meta; + pname = "element-web"; + inherit (pinData) version; - dontUnpack = true; + src = fetchFromGitHub { + owner = "vector-im"; + repo = pname; + rev = "v${version}"; + sha256 = pinData.webSrcHash; + }; - nativeBuildInputs = [ jq ]; + offlineCache = fetchYarnDeps { + yarnLock = src + "/yarn.lock"; + sha256 = pinData.webYarnHash; + }; + + nativeBuildInputs = [ yarn fixup_yarn_lock jq nodejs ]; + + configurePhase = '' + runHook preConfigure + + export HOME=$PWD/tmp + # with the update of openssl3, some key ciphers are not supported anymore + # this flag will allow those codecs again as a workaround + # see https://medium.com/the-node-js-collection/node-js-17-is-here-8dba1e14e382#5f07 + # and https://github.com/vector-im/element-web/issues/21043 + export NODE_OPTIONS=--openssl-legacy-provider + mkdir -p $HOME + + fixup_yarn_lock yarn.lock + yarn config --offline set yarn-offline-mirror $offlineCache + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules + + runHook postConfigure + ''; + + buildPhase = '' + runHook preBuild + + export VERSION=${version} + yarn build:res --offline + yarn build:module_system --offline + yarn build:bundle --offline + + runHook postBuild + ''; installPhase = '' runHook preInstall - mkdir -p $out - ln -s ${unwrapped}/* $out - rm $out/config.json - jq -s '.[0] * $conf' "${unwrapped}/config.json" --argjson "conf" '${builtins.toJSON conf}' > "$out/config.json" + cp -R webapp $out + cp ${jitsi-meet}/libs/external_api.min.js $out/jitsi_external_api.min.js + echo "${version}" > "$out/version" + jq -s '.[0] * $conf' "config.sample.json" --argjson "conf" '${builtins.toJSON noPhoningHome}' > "$out/config.json" runHook postInstall ''; + + meta = { + description = "A glossy Matrix collaboration client for the web"; + homepage = "https://element.io/"; + changelog = "https://github.com/vector-im/element-web/blob/v${version}/CHANGELOG.md"; + maintainers = lib.teams.matrix.members; + license = lib.licenses.asl20; + platforms = lib.platforms.all; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 04a672f2e5a8..ae3b4023e5a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3910,8 +3910,10 @@ with pkgs; NIXOS_OZONE_WL=1 exec ${element-desktop}/bin/element-desktop "$@" ''; - element-web = callPackage ../applications/networking/instant-messengers/element/element-web.nix { - conf = config.element-web.conf or {}; + element-web-unwrapped = callPackage ../applications/networking/instant-messengers/element/element-web.nix { }; + + element-web = callPackage ../applications/networking/instant-messengers/element/element-web-wrapper.nix { + conf = config.element-web.conf or { }; }; elementary-xfce-icon-theme = callPackage ../data/icons/elementary-xfce-icon-theme { }; From f6fd1b9a53d0ae24f7e1c14da2f021f9aedaa8bd Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 2 Jan 2023 13:07:46 +0100 Subject: [PATCH 02/49] python312: fix build on darwin --- pkgs/development/interpreters/python/cpython/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/python/cpython/default.nix b/pkgs/development/interpreters/python/cpython/default.nix index 8d55ea6c39cb..63bbcee624a5 100644 --- a/pkgs/development/interpreters/python/cpython/default.nix +++ b/pkgs/development/interpreters/python/cpython/default.nix @@ -260,7 +260,7 @@ in with passthru; stdenv.mkDerivation { ] ++ optionals (pythonAtLeast "3.9" && pythonOlder "3.11" && stdenv.isDarwin) [ # Stop checking for TCL/TK in global macOS locations ./3.9/darwin-tcl-tk.patch - ] ++ optionals (isPy3k && hasDistutilsCxxPatch) [ + ] ++ optionals (isPy3k && hasDistutilsCxxPatch && pythonOlder "3.12") [ # Fix for http://bugs.python.org/issue1222585 # Upstream distutils is calling C compiler to compile C++ code, which # only works for GCC and Apple Clang. This makes distutils to call C++ From 7eabf29b98470c8f918d79e280a9669b72e578e3 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Wed, 11 Jan 2023 10:16:36 +0100 Subject: [PATCH 03/49] vscode-extensions.streetsidesoftware.code-spell-checker: 2.12.0 -> 2.14.0 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 45e006854e21..7836289a4a51 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -2559,8 +2559,8 @@ let mktplcRef = { name = "code-spell-checker"; publisher = "streetsidesoftware"; - version = "2.12.0"; - sha256 = "sha256-Dhd0QVWdCCvdGKuu8OB4KrBS0XUHWLzRSyreAf7sGLU="; + version = "2.14.0"; + sha256 = "sha256-DvcQ0wNmWqmMen7jYVP0tCDz/wdzBb56An+OaD3d4xA="; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/streetsidesoftware.code-spell-checker/changelog"; From e4e64ad6ade6353e32d69d2bf3b4656ba41b31db Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 12:34:52 +0000 Subject: [PATCH 04/49] pulumictl: 0.0.38 -> 0.0.39 --- pkgs/development/tools/pulumictl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/pulumictl/default.nix b/pkgs/development/tools/pulumictl/default.nix index a42da5f105c6..561187eae0f0 100644 --- a/pkgs/development/tools/pulumictl/default.nix +++ b/pkgs/development/tools/pulumictl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pulumictl"; - version = "0.0.38"; + version = "0.0.39"; src = fetchFromGitHub { owner = "pulumi"; repo = "pulumictl"; rev = "v${version}"; - sha256 = "sha256-j7wuzyGko3agDO7L8MUaAegjE4yj4KzQEcxWLY39BhQ="; + sha256 = "sha256-85a0qW4Fy+ojAhdlRU/m7mkHX91GoZAHlEGPljLAj4c="; }; - vendorSha256 = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; + vendorHash = "sha256-WzfTS68YIpoZYbm6i0USxXyEyR4px+hrNRbsCTXdJsk="; ldflags = [ "-s" "-w" "-X=github.com/pulumi/pulumictl/pkg/version.Version=${src.rev}" From 93923837b5cbfe3a21c4c0043ac23f063be8e3a5 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Wed, 11 Jan 2023 12:34:49 -0300 Subject: [PATCH 05/49] pkgsMusl.wxGTK32: fix build --- pkgs/development/libraries/wxwidgets/wxGTK32.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/development/libraries/wxwidgets/wxGTK32.nix b/pkgs/development/libraries/wxwidgets/wxGTK32.nix index 1f4e41315453..543c6fb4e055 100644 --- a/pkgs/development/libraries/wxwidgets/wxGTK32.nix +++ b/pkgs/development/libraries/wxwidgets/wxGTK32.nix @@ -2,6 +2,7 @@ , stdenv , expat , fetchFromGitHub +, fetchpatch , fetchurl , gnome2 , gst_all_1 @@ -61,6 +62,16 @@ stdenv.mkDerivation rec { hash = "sha256-k6td/8pF7ad7+gVm7L0jX79fHKwR7/qrOBpSFggyaI0="; }; + # Workaround for pkgsMusl.wxGTK32 failing as: + # "./src/unix/uilocale.cpp:650:37: error: ‘_NL_IDENTIFICATION_TERRITORY’ was not declared in this scope" + # On upgrade, please test building wxwidgets for pkgsMusl, and remove this patch if unnecessary. + patches = lib.optional stdenv.hostPlatform.isMusl [ + (fetchpatch { + url = "https://github.com/wxWidgets/wxWidgets/commit/1faf1796b23b2503296d9b1e9ad39047d633f8c9.patch"; + sha256 = "sha256-0FbfzGzzkriLD2iDcRcBXgYqjHtxFsmSlhGE5d18/bo="; + }) + ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ From 9731fff13e13340a982b451c0c3ea40af232070c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 Jan 2023 04:20:00 +0000 Subject: [PATCH 06/49] buildkit: 0.10.6 -> 0.11.0 https://github.com/moby/buildkit/releases/tag/v0.11.0 --- pkgs/development/tools/buildkit/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 0353fb10ae1e..0b8478164f22 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.6"; + version = "0.11.0"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-bTzpiTqdAfo31sFRBCp0EzYMVjc6jt4aPK0VLsB9j0g="; + hash = "sha256-zRkfH/CHLoulB/IDq2VPc8a6N2wMzX0Ws9oE9339VOQ="; }; - vendorSha256 = null; + vendorHash = null; subPackages = [ "cmd/buildctl" ] ++ lib.optionals stdenv.isLinux [ "cmd/buildkitd" ]; From 70759f9cf72b5c38e984521e11ca8280a601efbe Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 Jan 2023 04:20:00 +0000 Subject: [PATCH 07/49] vale: 2.21.3 -> 2.22.0 https://github.com/errata-ai/vale/releases/tag/v2.22.0 --- pkgs/tools/text/vale/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index 3c450bb76484..cd1147ba4c7f 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.21.3"; + version = "2.22.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-QklvwCiBnxh092c0ZDyesxKiQ45n1OctYovVAili/G0="; + hash = "sha256-/8npVrVyyxYLiJotCdqeGE0d9w8pOjShx1fpmRkKW9k="; }; - vendorSha256 = "sha256-7P77tR2wACRgF+8A/L/wPcq6etwzAX3pFO46FfGVTiE="; + vendorHash = "sha256-7P77tR2wACRgF+8A/L/wPcq6etwzAX3pFO46FfGVTiE="; postInstall = '' mkdir -p $data/share/vale From 493fe01d9f00257654ee346f6b039cda8d960a35 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Thu, 12 Jan 2023 04:20:00 +0000 Subject: [PATCH 08/49] ocamlPackages.mldoc: 1.4.9 -> 1.5.2 --- pkgs/development/ocaml-modules/mldoc/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/mldoc/default.nix b/pkgs/development/ocaml-modules/mldoc/default.nix index ef40a07628a6..058261a78d3d 100644 --- a/pkgs/development/ocaml-modules/mldoc/default.nix +++ b/pkgs/development/ocaml-modules/mldoc/default.nix @@ -6,6 +6,7 @@ , cmdliner , core , core_bench +, core_unix , js_of_ocaml , js_of_ocaml-ppx , ppx_deriving_yojson @@ -28,21 +29,24 @@ let in buildDunePackage rec { pname = "mldoc"; - version = "1.4.9"; + version = "1.5.2"; minimalOCamlVersion = "4.10"; + duneVersion = "3"; + src = fetchFromGitHub { owner = "logseq"; repo = "mldoc"; rev = "v${version}"; - sha256 = "sha256-jKZ4ejskngXb03EnHBlqRKC5xeNHJ32n73y1zQP9CiM="; + hash = "sha256-FiBlgTTGL5TQkbhpkOCKtBgDDxDs4S88Ps+XAHcNsJ4="; }; buildInputs = [ cmdliner core core_bench + core_unix js_of_ocaml js_of_ocaml-ppx lwt From 0206a083136cbb1f319fc0c1b6517d2916b31a5a Mon Sep 17 00:00:00 2001 From: Jordan Isaacs Date: Fri, 2 Dec 2022 17:21:32 -0500 Subject: [PATCH 09/49] aoc-cli: init at 0.11.0 --- pkgs/tools/misc/aoc-cli/default.nix | 34 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/misc/aoc-cli/default.nix diff --git a/pkgs/tools/misc/aoc-cli/default.nix b/pkgs/tools/misc/aoc-cli/default.nix new file mode 100644 index 000000000000..34100865381e --- /dev/null +++ b/pkgs/tools/misc/aoc-cli/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, rustPlatform +, fetchFromGitHub +, pkg-config +, openssl +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "aoc-cli"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "scarvalhojr"; + repo = pname; + rev = version; + hash = "sha256-oUvEZEnhYeAAZyLn2/isDZKT0+mhS5fnCvYGsR94uk0="; + }; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optional stdenv.isDarwin Security; + + cargoHash = "sha256-/76yzWPKGp4MEmFuvFJOMCxGKEdpohfzBAhRwvdEx8w="; + + meta = with lib; { + description = "Advent of code command line tool"; + homepage = "https://github.com/scarvalhojr/aoc-cli/"; + license = licenses.mit; + maintainers = with maintainers; [ jordanisaacs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 41cbd347df6a..11aa0c2000cb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3365,6 +3365,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) Security; }; + aoc-cli = callPackage ../tools/misc/aoc-cli { + inherit (darwin.apple_sdk.frameworks) Security; + }; + apprise = with python3Packages; toPythonApplication apprise; aptdec = callPackage ../development/libraries/aptdec {}; From a0d2fa17bee251db0b74f7f8df2907b1aaf9398d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Jan 2023 10:06:26 +0800 Subject: [PATCH 10/49] julia_19: init at 1.9.0-beta2 --- pkgs/development/compilers/julia/1.9.nix | 94 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 95 insertions(+) create mode 100644 pkgs/development/compilers/julia/1.9.nix diff --git a/pkgs/development/compilers/julia/1.9.nix b/pkgs/development/compilers/julia/1.9.nix new file mode 100644 index 000000000000..71bf442c82cd --- /dev/null +++ b/pkgs/development/compilers/julia/1.9.nix @@ -0,0 +1,94 @@ +{ lib +, stdenv +, fetchurl +, fetchpatch +, which +, python3 +, gfortran +, cmake +, perl +, gnum4 +, openssl +, libxml2 +}: + +stdenv.mkDerivation rec { + pname = "julia"; + version = "1.9.0-beta2"; + + src = fetchurl { + url = "https://github.com/JuliaLang/julia/releases/download/v${version}/julia-${version}-full.tar.gz"; + hash = "sha256-LTQp5vBMOSlwThYpSIv/UNJ9eIU+WId/XWGFxsrQEzs="; + }; + + patches = [ + ./patches/1.8/0002-skip-failing-and-flaky-tests.patch + # https://github.com/JuliaLang/julia/issues/46530 + (fetchpatch { + url = "https://github.com/JuliaLang/julia/commit/b9b60fcde61ff18d77cb548421b3f71a369b4e02.patch"; + revert = true; + hash = "sha256-XXn4U8aWkWwZYwpvIx+Gk5E16prjeXooF9AafK0aEfg="; + }) + ]; + + strictDeps = true; + + nativeBuildInputs = [ + which + python3 + gfortran + cmake + perl + gnum4 + openssl + ]; + + buildInputs = [ + libxml2 + ]; + + dontUseCmakeConfigure = true; + + postPatch = '' + patchShebangs . + ''; + + makeFlags = [ + "prefix=$(out)" + "USE_BINARYBUILDER=0" + # workaround for https://github.com/JuliaLang/julia/issues/47989 + "USE_INTEL_JITEVENTS=0" + ] ++ lib.optionals stdenv.isx86_64 [ + # https://github.com/JuliaCI/julia-buildbot/blob/master/master/inventory.py + "JULIA_CPU_TARGET=generic;sandybridge,-xsaveopt,clone_all;haswell,-rdrnd,base(1)" + ] ++ lib.optionals stdenv.isAarch64 [ + "JULIA_CPU_TARGET=generic;cortex-a57;thunderx2t99;armv8.2-a,crypto,fullfp16,lse,rdm" + ]; + + # remove forbidden reference to $TMPDIR + preFixup = '' + for file in libcurl.so libgmpxx.so libmpfr.so; do + patchelf --shrink-rpath --allowed-rpath-prefixes ${builtins.storeDir} "$out/lib/julia/$file" + done + ''; + + doInstallCheck = true; + installCheckTarget = "testall"; + + preInstallCheck = '' + export HOME="$TMPDIR" + export JULIA_TEST_USE_MULTIPLE_WORKERS="true" + ''; + + dontStrip = true; + + enableParallelBuilding = true; + + meta = with lib; { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "https://julialang.org/"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f50f92d1994d..0a271b7b7b6f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14864,6 +14864,7 @@ with pkgs; julia_18-bin = callPackage ../development/compilers/julia/1.8-bin.nix { }; julia_18 = callPackage ../development/compilers/julia/1.8.nix { }; + julia_19 = callPackage ../development/compilers/julia/1.9.nix { }; julia-lts-bin = julia_16-bin; julia-stable-bin = julia_18-bin; From 722a260c8a17711cd6fb6b27ab874165b1bcdbd9 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Thu, 12 Jan 2023 16:55:40 +0800 Subject: [PATCH 11/49] vsmtp: 1.3.3 -> 2.0.0 --- pkgs/servers/mail/vsmtp/default.nix | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/pkgs/servers/mail/vsmtp/default.nix b/pkgs/servers/mail/vsmtp/default.nix index 0bbebc669306..f9b595ec8f9e 100644 --- a/pkgs/servers/mail/vsmtp/default.nix +++ b/pkgs/servers/mail/vsmtp/default.nix @@ -1,36 +1,28 @@ { lib -, stdenv , rustPlatform , fetchFromGitHub -, pkg-config , installShellFiles -, openssl , testers , vsmtp }: rustPlatform.buildRustPackage rec { pname = "vsmtp"; - version = "1.3.3"; + version = "2.0.0"; src = fetchFromGitHub { owner = "viridIT"; repo = "vsmtp"; rev = "v${version}"; - hash = "sha256-nBkfIjACmjnVNF3hJ22B4ecjWrX9licV7c8Yxv2tQCg="; + hash = "sha256-uyu2NpHFDqJDcfQukG6TdRH7KuZnrYTULvLiABdvAog="; }; - cargoHash = "sha256-HqQ8WD1/K7xMx97SbuP45Q/+4oADh1WZFJPXB8wlkbM="; + cargoHash = "sha256-A0Q6ciZJL13VzJgZIWZalrRElSNGHUN/9b8Csj4Tdak="; - nativeBuildInputs = [ pkg-config installShellFiles ]; - buildInputs = [ openssl ]; + nativeBuildInputs = [ installShellFiles ]; - cargoBuildFlags = [ - "--package" - "vsmtp" - "--package" - "vqueue" - ]; + # too many upstream failures + doCheck = false; postInstall = '' installManPage tools/install/man/*.1 From 64eb3f16ce5fa61635a55e3e069683d5f9ec80f5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 09:51:53 +0000 Subject: [PATCH 12/49] rar2fs: 1.29.5 -> 1.29.6 --- pkgs/tools/filesystems/rar2fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/rar2fs/default.nix b/pkgs/tools/filesystems/rar2fs/default.nix index 19db209cbf91..2c987ccef0c3 100644 --- a/pkgs/tools/filesystems/rar2fs/default.nix +++ b/pkgs/tools/filesystems/rar2fs/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rar2fs"; - version = "1.29.5"; + version = "1.29.6"; src = fetchFromGitHub { owner = "hasse69"; repo = pname; rev = "v${version}"; - sha256 = "sha256-x3QBnnwt9pXT0egOJ2rnUcZP99y9eVcw3rNTkdH2LYs="; + sha256 = "sha256-b8zMCzSFJewXMQOuaKwMJx//Wq9vT/bUj6XS/jDBBBo="; }; postPatch = '' From adb2126c7a1cf89abe787b0e055161de74fbef79 Mon Sep 17 00:00:00 2001 From: Anthony Roussel Date: Thu, 12 Jan 2023 13:20:44 +0100 Subject: [PATCH 13/49] jira-cli-go: 1.2.0 -> 1.3.0 --- pkgs/development/tools/jira-cli-go/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/jira-cli-go/default.nix b/pkgs/development/tools/jira-cli-go/default.nix index f337fbf9d329..ccbee96fdd5f 100644 --- a/pkgs/development/tools/jira-cli-go/default.nix +++ b/pkgs/development/tools/jira-cli-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "jira-cli-go"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitHub { owner = "ankitpokhrel"; repo = "jira-cli"; rev = "v${version}"; - hash = "sha256-ruFSqD/QLIK69hx9lNulWjyXVJzGACmghAU4fFEgEJo="; + hash = "sha256-T7EAlHHjoACJOra47zp5tXrkYWQ8o9Qame6QmiTrIXY="; }; - vendorSha256 = "sha256-SpUggA9u8OGV2zF3EQ0CB8M6jpiVQi957UGaN+foEuk="; + vendorSha256 = "sha256-b/z2oSWY33XSxpHi+Tit2ThnNrdk5QNI4oZWPMBKmd0="; ldflags = [ "-s" "-w" From f254d1522885b8eba982265ed2e48dd2ad61341b Mon Sep 17 00:00:00 2001 From: DarkOnion0 Date: Thu, 12 Jan 2023 13:32:25 +0100 Subject: [PATCH 14/49] devspace: 6.2.3 -> 6.2.4 --- pkgs/development/tools/misc/devspace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/devspace/default.nix b/pkgs/development/tools/misc/devspace/default.nix index 63fac79017e8..8dddea94f05e 100644 --- a/pkgs/development/tools/misc/devspace/default.nix +++ b/pkgs/development/tools/misc/devspace/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "devspace"; - version = "6.2.3"; + version = "6.2.4"; src = fetchFromGitHub { owner = "loft-sh"; repo = "devspace"; rev = "v${version}"; - sha256 = "sha256-AaEShzCdDcYCFXZRqr+Q98xsh5Ml7pcwcqIzGEa11oo="; + sha256 = "sha256-Y2MFxceOS3H4Ya0EupgQqtOnkhEk6DXbg6rix3J9OtM="; }; vendorSha256 = null; From b249be805eae83dc0b3e4df572ce63a585dbcd15 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 13:33:11 +0000 Subject: [PATCH 15/49] helmsman: 3.15.1 -> 3.16.0 --- pkgs/applications/networking/cluster/helmsman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/helmsman/default.nix b/pkgs/applications/networking/cluster/helmsman/default.nix index 4915b2766ee7..ddc254adc93a 100644 --- a/pkgs/applications/networking/cluster/helmsman/default.nix +++ b/pkgs/applications/networking/cluster/helmsman/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "helmsman"; - version = "3.15.1"; + version = "3.16.0"; src = fetchFromGitHub { owner = "Praqma"; repo = "helmsman"; rev = "v${version}"; - sha256 = "sha256-LgfYcptC1fcINf80dbOZu8HD5oTrF0tTMQCWdsO3H5U="; + sha256 = "sha256-84Lxix2UFEW9XymKMxFaAwZfPepPn4MjKaz8jXfB9AI="; }; - vendorSha256 = "sha256-iEsblhejczTFPL7LvEKHE/T1h2xAt7cdnoR8KIv3Wpo="; + vendorHash = "sha256-dzzgHda1kW2V9u9x/A9oYhpvTpUDa2DVZA/sHrieiWo="; doCheck = false; From 32ba93e3672b9e4b75d401921a0b5d5dbc8f72b6 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Thu, 12 Jan 2023 15:15:30 +0100 Subject: [PATCH 16/49] signal-desktop: 6.1.0 -> 6.2.0 --- .../networking/instant-messengers/signal-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 6c7aed47c271..307a11055ee4 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -1,8 +1,8 @@ { callPackage }: builtins.mapAttrs (pname: attrs: callPackage ./generic.nix (attrs // { inherit pname; })) { signal-desktop = { dir = "Signal"; - version = "6.1.0"; - hash = "sha256-70IQ/2yjHbez8SpZxqZKa/XWIEYA3cN7JAIM9kgjN30="; + version = "6.2.0"; + hash = "sha256-auOcMlwKPj5rsnlhK34sYe4JxlHCjb3e2ye8Cs12Qtc="; }; signal-desktop-beta = { dir = "Signal Beta"; From 63f96b8e028fa93e63722a41e13d8d35b059a388 Mon Sep 17 00:00:00 2001 From: kilianar Date: Thu, 12 Jan 2023 15:42:01 +0100 Subject: [PATCH 17/49] logseq: 0.8.15 -> 0.8.16 https://github.com/logseq/logseq/releases/tag/0.8.16 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 505dd6002680..ea855f3d30be 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -9,11 +9,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.8.15"; + version = "0.8.16"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "sha256-lE/bO/zpqChvdf8vfNqbC5iIpXAZDb36/N7Tpsj7PWY="; + sha256 = "sha256-0tIDoNQoqSn1nYm+YdgzXh34aH1e5N8wl9lqGbQoOeU="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0d6d5875e9a..86b9031627e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2440,7 +2440,7 @@ with pkgs; lilo = callPackage ../tools/misc/lilo { }; logseq = callPackage ../applications/misc/logseq { - electron = electron_19; + electron = electron_20; }; natls = callPackage ../tools/misc/natls { }; From 84a30dfdb916675306fe9baadb02c446b1cb4117 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 16:21:02 +0000 Subject: [PATCH 18/49] python310Packages.datasette: 0.63.3 -> 0.64.1 --- pkgs/development/python-modules/datasette/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/datasette/default.nix b/pkgs/development/python-modules/datasette/default.nix index 91517c564f91..c0833f34a05b 100644 --- a/pkgs/development/python-modules/datasette/default.nix +++ b/pkgs/development/python-modules/datasette/default.nix @@ -29,7 +29,7 @@ buildPythonPackage rec { pname = "datasette"; - version = "0.63.3"; + version = "0.64.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -38,7 +38,7 @@ buildPythonPackage rec { owner = "simonw"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-SnUhF7QOXwCU288L4BB4JnhtP6XyHsBS1PpaFM32J0w="; + sha256 = "sha256-EXYAiXqEfQVDTwc4MFTroLPEaTZ3QYTlUsuNQ72oHpA="; }; postPatch = '' From 0390e61b6e8d113d0d826641f3a90b83b8b62d4f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Thu, 12 Jan 2023 17:48:28 +0100 Subject: [PATCH 19/49] vscode-extensions.maximedenes.vscoq: 0.3.6 -> 0.3.7 --- pkgs/applications/editors/vscode/extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 45e006854e21..68e03a41898e 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1741,8 +1741,8 @@ let mktplcRef = { publisher = "maximedenes"; name = "vscoq"; - version = "0.3.6"; - sha256 = "sha256-b0gCaEzt5yAj53oLFZSXSD3bum9J1fYes/uf9+OlUek="; + version = "0.3.7"; + sha256 = "sha256-QT+fb23g+IXlNKNAbjADEpqrS6ll2W8Yd0YzwJAjhQQ="; }; meta = with lib; { description = "VsCoq is an extension for Visual Studio Code (VS Code) and VSCodium with support for the Coq Proof Assistant."; From 0bbb9414d400f5000985d6481f1b63a20e9f14b7 Mon Sep 17 00:00:00 2001 From: Adam Stephens Date: Sun, 8 Jan 2023 18:01:45 -0500 Subject: [PATCH 20/49] river: 0.2.0 -> 0.2.1 --- pkgs/applications/window-managers/river/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/river/default.nix b/pkgs/applications/window-managers/river/default.nix index e4f0760b68eb..7a10bf4cfaef 100644 --- a/pkgs/applications/window-managers/river/default.nix +++ b/pkgs/applications/window-managers/river/default.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { pname = "river"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "riverwm"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-BrOZch6wkiBB4rk0M7Aoy8sZh8uOTQFOPxd3xLyy/K0="; + rev = "refs/tags/v${version}"; + hash = "sha256-eIW8NNhacAM/7gZCUHCmiySANLenfcaCRTUkoJUZRPQ="; fetchSubmodules = true; }; From e4be43c6d007921355b335921adaac9b2b291e6a Mon Sep 17 00:00:00 2001 From: Ben Darwin Date: Wed, 11 Jan 2023 17:05:25 -0500 Subject: [PATCH 21/49] charls: init at 2.4.1 --- pkgs/development/libraries/charls/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/libraries/charls/default.nix diff --git a/pkgs/development/libraries/charls/default.nix b/pkgs/development/libraries/charls/default.nix new file mode 100644 index 000000000000..e7b8a54820e3 --- /dev/null +++ b/pkgs/development/libraries/charls/default.nix @@ -0,0 +1,35 @@ +{ lib, stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + pname = "charls"; + version = "2.4.1"; + + src = fetchFromGitHub { + owner = "team-charls"; + repo = pname; + rev = "refs/tags/${version}"; + hash = "sha256-l0qcJeQfRqpwR7vNmYZx00kGlPkK7nEYuslydjxj7ss="; + }; + + postPatch = '' + substituteInPlace src/charls-template.pc \ + --replace '$'{prefix}/@CMAKE_INSTALL_LIBDIR@ @CMAKE_INSTALL_FULL_LIBDIR@ \ + --replace '$'{prefix}/@CMAKE_INSTALL_INCLUDEDIR@ @CMAKE_INSTALL_FULL_INCLUDEDIR@ + ''; + + nativeBuildInputs = [ cmake ]; + + cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; + + # note this only runs some basic tests, not the full test suite, + # but the recommended `charlstest -unittest` fails with an inscrutable C++ IO error + doCheck = true; + + meta = with lib; { + homepage = "https://github.com/team-charls/charls"; + description = "A JPEG-LS library implementation in C++"; + maintainers = with maintainers; [ bcdarwin ]; + license = licenses.bsd3; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f33f49a051fc..39972ac4bad0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18865,6 +18865,8 @@ with pkgs; cgui = callPackage ../development/libraries/cgui {}; + charls = callPackage ../development/libraries/charls { }; + check = callPackage ../development/libraries/check { inherit (darwin.apple_sdk.frameworks) CoreServices; }; From 5338ab8f13d1a7b27af5814f7ae97729059abd9e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Jan 2023 18:59:20 +0100 Subject: [PATCH 22/49] python310Packages.python-fsutil: 0.9.1 -> 0.9.3 Changelog: https://github.com/fabiocaccamo/python-fsutil/blob/0.9.3/CHANGELOG.md --- pkgs/development/python-modules/python-fsutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-fsutil/default.nix b/pkgs/development/python-modules/python-fsutil/default.nix index 6ebb1485d203..0d458bd367d9 100644 --- a/pkgs/development/python-modules/python-fsutil/default.nix +++ b/pkgs/development/python-modules/python-fsutil/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-fsutil"; - version = "0.9.1"; + version = "0.9.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-rMQjsGqdiXe8zS18hZQAro3UWyHPjNJYyQ/NAoxbE7k="; + hash = "sha256-fXfLXr8Zf3rQOkmfGx5SrbsFtw9AthohoV1NiRCOBM8="; }; propagatedBuildInputs = [ From 7e9cfd1bc7b4d49e7fafbf28379046e914c9c51b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 12 Jan 2023 19:00:17 +0100 Subject: [PATCH 23/49] python310Packages.python-decouple: 3.6 -> 3.7 Changelog: https://github.com/HBNetwork/python-decouple/blob/v3.7/CHANGELOG.md --- pkgs/development/python-modules/python-decouple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-decouple/default.nix b/pkgs/development/python-modules/python-decouple/default.nix index 99f202192294..9c9ca292d4e4 100644 --- a/pkgs/development/python-modules/python-decouple/default.nix +++ b/pkgs/development/python-modules/python-decouple/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "python-decouple"; - version = "3.6"; + version = "3.7"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "HBNetwork"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ll0MZb4FaNFF/jvCfj4TkuoAi4m448KaOU3ykvKPbSo="; + hash = "sha256-sCUlE+92+nG7ZHuGKXRJVx2wokNP7/F7g8LvdRWqHCQ="; }; checkInputs = [ From 10199957aff53dee472bd18d6c81ee0a671a60ed Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 12 Jan 2023 13:04:33 -0500 Subject: [PATCH 24/49] star-history: 1.0.9 -> 1.0.10 --- pkgs/tools/misc/star-history/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/star-history/default.nix b/pkgs/tools/misc/star-history/default.nix index 4ce363f7d4b9..81964d892115 100644 --- a/pkgs/tools/misc/star-history/default.nix +++ b/pkgs/tools/misc/star-history/default.nix @@ -9,14 +9,14 @@ rustPlatform.buildRustPackage rec { pname = "star-history"; - version = "1.0.9"; + version = "1.0.10"; src = fetchCrate { inherit pname version; - sha256 = "sha256-el1+Ok8dRaBZMghSvE2xb5RvYq0AQfjeneWrb1so1/s="; + sha256 = "sha256-zDWfeyZTQ4yaBK3vuX6+Rb6/+DFOESMDTQ7Bg/XN06I="; }; - cargoSha256 = "sha256-VHneYfHr+W1r/B22I3DKIC2XvT8ZjeZIGfTDkneXJss="; + cargoSha256 = "sha256-epIqjmQStSHdpEH7YVnsHVz3tEIz3cdJY9O+lzg7b2Q="; nativeBuildInputs = [ pkg-config ]; From 5d2936b3da2d5d5aae2e0c43516d770d43463477 Mon Sep 17 00:00:00 2001 From: Florian Engel Date: Thu, 15 Dec 2022 16:25:33 +0100 Subject: [PATCH 25/49] dcmkt: Fix build --- .../science/medicine/dcmtk/0001-Fix-cmake.patch | 12 ++++++++++++ pkgs/applications/science/medicine/dcmtk/default.nix | 9 +++++++-- 2 files changed, 19 insertions(+), 2 deletions(-) create mode 100644 pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch diff --git a/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch new file mode 100644 index 000000000000..053edac85b21 --- /dev/null +++ b/pkgs/applications/science/medicine/dcmtk/0001-Fix-cmake.patch @@ -0,0 +1,12 @@ +diff --git a/CMake/dcmtk.pc.in b/CMake/dcmtk.pc.in +index 13c79c0d5..b1edf725c 100644 +--- a/CMake/dcmtk.pc.in ++++ b/CMake/dcmtk.pc.in +@@ -1,6 +1,6 @@ + prefix="@CMAKE_INSTALL_PREFIX@" + exec_prefix="${prefix}" +- libdir="${prefix}/@CMAKE_INSTALL_LIBDIR@" ++ libdir=@CMAKE_INSTALL_FULL_LIBDIR@" + includedir="${prefix}/include/" + + Name: DCMTK diff --git a/pkgs/applications/science/medicine/dcmtk/default.nix b/pkgs/applications/science/medicine/dcmtk/default.nix index a1f4b455ce79..3b4361228635 100644 --- a/pkgs/applications/science/medicine/dcmtk/default.nix +++ b/pkgs/applications/science/medicine/dcmtk/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv, libpng, cmake }: +{ lib, stdenv, fetchFromGitHub, zlib, libtiff, libxml2, openssl, libiconv +, libpng, cmake, fetchpatch }: with lib; stdenv.mkDerivation rec { @@ -14,8 +15,12 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ libpng zlib libtiff libxml2 openssl libiconv ]; + # This is only needed until https://github.com/DCMTK/dcmtk/pull/75/files is merged + patches = [ ./0001-Fix-cmake.patch ]; + meta = { - description = "Collection of libraries and applications implementing large parts of the DICOM standard"; + description = + "Collection of libraries and applications implementing large parts of the DICOM standard"; longDescription = '' DCMTK is a collection of libraries and applications implementing large parts of the DICOM standard. It includes software for examining, constructing and converting DICOM image files, handling offline media, From d6adb0f0c5e0788f755f4161ca258ffcecc66c0d Mon Sep 17 00:00:00 2001 From: Anillc Date: Fri, 13 Jan 2023 03:38:12 +0800 Subject: [PATCH 26/49] go-cqhttp: init at 1.0.0-rc4 --- pkgs/servers/go-cqhttp/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/servers/go-cqhttp/default.nix diff --git a/pkgs/servers/go-cqhttp/default.nix b/pkgs/servers/go-cqhttp/default.nix new file mode 100644 index 000000000000..c6ab0a6addc9 --- /dev/null +++ b/pkgs/servers/go-cqhttp/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule +, fetchFromGitHub +, lib +}: + +buildGoModule rec { + pname = "go-cqhttp"; + version = "1.0.0-rc4"; + + src = fetchFromGitHub { + owner = "Mrs4s"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7TWKd0y8yBi2piKBCUZFeo3swtC/SteRtXXRv7Ojajs="; + }; + + vendorSha256 = "sha256-Oz/4bazhNnkf26YJ4H7c7d7vNzIJxG2OG0BJOiHBY7Y="; + + meta = with lib; { + description = "The Golang implementation of OneBot based on Mirai and MiraiGo"; + homepage = "https://github.com/Mrs4s/go-cqhttp"; + license = licenses.agpl3Only; + maintainers = with maintainers; [ Anillc ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 48097badba56..604c1374b5ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24057,6 +24057,8 @@ with pkgs; go-camo = callPackage ../servers/http/go-camo { }; + go-cqhttp = callPackage ../servers/go-cqhttp { }; + gofish = callPackage ../servers/gopher/gofish { }; grafana = callPackage ../servers/monitoring/grafana { }; From 66fac9b1cf4ac50a5578bc484410bf1e7e8d2898 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 21:26:09 +0000 Subject: [PATCH 27/49] ferium: 4.2.2 -> 4.3.3 --- pkgs/games/ferium/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/ferium/default.nix b/pkgs/games/ferium/default.nix index 096374749a94..723852540f63 100644 --- a/pkgs/games/ferium/default.nix +++ b/pkgs/games/ferium/default.nix @@ -2,18 +2,18 @@ rustPlatform.buildRustPackage rec { pname = "ferium"; - version = "4.2.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "gorilla-devs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CtqnPHTFkfHE8IolqSlGt8n1fsLXCKMiBt8fQzLBPYk="; + sha256 = "sha256-obfPMD5zv2Q4ztDLCo4W8k6H80OKDQl/cDD8B5VnQMY="; }; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "sha256-EYfqdGpaAWDmvqov/k81kE9frHYNKOTHakCrHN7zpU4="; + cargoHash = "sha256-xp7Oy6cKFTdc6KsXJFtyEYRnGazjxf/4HpKcIsAt+ko="; # Disable the GUI file picker so that GTK/XDG dependencies aren't used buildNoDefaultFeatures = true; From 4c6b7d41c0f1d22020dc1624a73d7717079905ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 12 Jan 2023 13:58:37 -0800 Subject: [PATCH 28/49] restic: 0.14.0 -> 0.15.0 https://github.com/restic/restic/releases/tag/v0.15.0 --- pkgs/tools/backup/restic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/restic/default.nix b/pkgs/tools/backup/restic/default.nix index 3b4a644a71f6..44683fa3884c 100644 --- a/pkgs/tools/backup/restic/default.nix +++ b/pkgs/tools/backup/restic/default.nix @@ -3,13 +3,13 @@ buildGoModule rec { pname = "restic"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "restic"; repo = "restic"; rev = "v${version}"; - hash = "sha256-DwXAifXXQNnbzj2XngCyqPABzB9PS/T9U2/T4/z7wm0="; + hash = "sha256-qWVmsW16eQM7d+HoHR2qE7GpcC5HK7TIhhx6J2glKpA="; }; patches = [ @@ -17,7 +17,7 @@ buildGoModule rec { ./0001-Skip-testing-restore-with-permission-failure.patch ]; - vendorSha256 = "sha256-FakmnQ8RkBYjmj3piA1lDV61FdYIyBmFLY2XXN3AyIQ="; + vendorHash = "sha256-zhLFMvp97mQclaLwH4Hl8jFNMmoYrf8AtVv49RDq7lM="; subPackages = [ "cmd/restic" ]; From f77ade489b706cdfd52a0af22a7ddbe59c3d33d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 23:05:36 +0000 Subject: [PATCH 29/49] checkstyle: 10.5.0 -> 10.6.0 --- pkgs/development/tools/analysis/checkstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 5fbf057ec3e0..8c8b0eb29ad9 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, makeWrapper, jre }: stdenv.mkDerivation rec { - version = "10.5.0"; + version = "10.6.0"; pname = "checkstyle"; src = fetchurl { url = "https://github.com/checkstyle/checkstyle/releases/download/checkstyle-${version}/checkstyle-${version}-all.jar"; - sha256 = "sha256-GbPVA/Z9R0P9prJTFJUCTV9pq9/Cbl6UOjwhAlhe9BA="; + sha256 = "sha256-ghGrRu7a9OUVti6P4QRrGFSmQqX8XCfn7aBHR4Q7RCI="; }; nativeBuildInputs = [ makeWrapper ]; From 1d852d7bcd6ca7c5c45b02e15382e01f9f345344 Mon Sep 17 00:00:00 2001 From: Matheus Vieira Date: Thu, 12 Jan 2023 16:49:54 -0300 Subject: [PATCH 30/49] capitaine-cursors-themed: init at r5 --- .../capitaine-cursors-themed/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/data/icons/capitaine-cursors-themed/default.nix diff --git a/pkgs/data/icons/capitaine-cursors-themed/default.nix b/pkgs/data/icons/capitaine-cursors-themed/default.nix new file mode 100644 index 000000000000..d86ce3f8161a --- /dev/null +++ b/pkgs/data/icons/capitaine-cursors-themed/default.nix @@ -0,0 +1,21 @@ +{ lib, fetchzip }: +fetchzip rec { + pname = "capitaine-cursors-themed"; + version = "5"; + stripRoot = false; + url = "https://github.com/sainnhe/capitaine-cursors/releases/download/r${version}/Linux.zip"; + sha256 = "jQNAXuR/OtvohWziGYgb5Ni2/tEIGaY9HIyUUW793EY="; + + postFetch = '' + mkdir -p $out/share/icons + cp -r ./ $out/share/icons + ''; + + meta = with lib; { + description = "A fork of the capitaine cursor theme, with some additional variants (Gruvbox, Nord, Palenight) and support for HiDPI"; + homepage = "https://github.com/sainnhe/capitaine-cursors"; + license = licenses.lgpl3Only; + platforms = platforms.unix; + maintainers = [ maintainers.math-42 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8e15d2571837..682570a002e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -26505,6 +26505,8 @@ with pkgs; capitaine-cursors = callPackage ../data/icons/capitaine-cursors { }; + capitaine-cursors-themed = callPackage ../data/icons/capitaine-cursors-themed { }; + carlito = callPackage ../data/fonts/carlito {}; cascadia-code = callPackage ../data/fonts/cascadia-code { }; From e7a795e82b9f6dca6d68117d62b8b2da76d3add7 Mon Sep 17 00:00:00 2001 From: figsoda Date: Thu, 12 Jan 2023 18:35:52 -0500 Subject: [PATCH 31/49] ruff: 0.0.219 -> 0.0.220 Diff: https://github.com/charliermarsh/ruff/compare/v0.0.219...v0.0.220 Changelog: https://github.com/charliermarsh/ruff/releases/tag/v0.0.220 --- pkgs/development/tools/ruff/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 76c09c064e53..32644a21aba7 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.219"; + version = "0.0.220"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Aw3IjU1gBkWOMkHnjs/tddFPax588tsdlamhLJoq9HM="; + sha256 = "sha256-yOErc17Mm4eDrJkT7U+6CTGI67xM2u8XA+MwbxO9AUg="; }; - cargoSha256 = "sha256-W3t1sAwQx9a7qkM9OcEZ6datdkpxqRi5wwqZglKoK2A="; + cargoSha256 = "sha256-3Ez7X6XmobFO4WslE0lhCcT/Qu4FCaMcDPvoADNlfjM="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.CoreServices From ee7e9da5b98bf4cf32a28baebca8852fd1f0d18a Mon Sep 17 00:00:00 2001 From: Kevin Puetz Date: Thu, 12 Jan 2023 17:58:14 -0600 Subject: [PATCH 32/49] borgbackup: cherry-pick patch to fix tests borgbackup/borg#7250 is now fixed in 1.2-maint (pending for borg 1.2.4) but borgbackup/borg#7252 was amended to a different approach before being apporoved. Replace the original workaround with upstream's fix. --- pkgs/tools/backup/borgbackup/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index 89642b33a726..28fcf8bc90fa 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -28,8 +28,8 @@ python3.pkgs.buildPythonApplication rec { (fetchpatch { # Fix HashIndexSizeTestCase.test_size_on_disk_accurate problems on ZFS, # see https://github.com/borgbackup/borg/issues/7250 - url = "https://github.com/borgbackup/borg/pull/7252/commits/537a814e53e20013a041faa7192da005f137cf5b.patch"; - hash = "sha256-dnF/FW8pS4Ub9aAL4b7zf6ZNjMZaiMqdtl5R+DlAZTM="; + url = "https://github.com/borgbackup/borg/pull/7252/commits/fe3775cf8078c18d8fe39a7f42e52e96d3ecd054.patch"; + hash = "sha256-gdssHfhdkmRfSAOeXsq9Afg7xqGM3NLIq4QnzmPBhw4="; }) ]; From 751c4644d58f78dc43a7b9acd9cc4da71ee4fb05 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 01:48:39 +0000 Subject: [PATCH 33/49] tinygltf: 2.7.0 -> 2.8.0 --- pkgs/development/libraries/tinygltf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/tinygltf/default.nix b/pkgs/development/libraries/tinygltf/default.nix index 8d8b6c4c9ed9..3f96ff26091f 100644 --- a/pkgs/development/libraries/tinygltf/default.nix +++ b/pkgs/development/libraries/tinygltf/default.nix @@ -6,14 +6,14 @@ }: stdenv.mkDerivation rec { - version = "2.7.0"; + version = "2.8.0"; pname = "tinygltf"; src = fetchFromGitHub { owner = "syoyo"; repo = "tinygltf"; rev = "v${version}"; - sha256 = "sha256-pIymkC+LzoSPU0jnpBH07ag/04W0c9TmPeDUSYQdgx4="; + sha256 = "sha256-r9LzrXFFdSVAsNKNDObsr+hsVvvnGDo+x/mRWLFkVIU="; }; nativeBuildInputs = [ cmake ]; From d08c24e52954fc3a97a0f98be75897c3d73f80ac Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Fri, 13 Jan 2023 02:20:55 +0100 Subject: [PATCH 34/49] auth0-cli, macchina: fix erroneous rev --- pkgs/tools/admin/auth0-cli/default.nix | 2 +- pkgs/tools/misc/macchina/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/auth0-cli/default.nix b/pkgs/tools/admin/auth0-cli/default.nix index b94955f611d7..0509173650de 100644 --- a/pkgs/tools/admin/auth0-cli/default.nix +++ b/pkgs/tools/admin/auth0-cli/default.nix @@ -10,7 +10,7 @@ buildGoModule rec { src = fetchFromGitHub { owner = "auth0"; repo = "auth0-cli"; - rev = "tags/release/v${version}"; + rev = "v${version}"; hash = "sha256-FotjdMbQXDwkURSeye86sIFN60V//UlF7kZrwfkvTGY="; }; diff --git a/pkgs/tools/misc/macchina/default.nix b/pkgs/tools/misc/macchina/default.nix index 099bb35b58a7..646cac461fd7 100644 --- a/pkgs/tools/misc/macchina/default.nix +++ b/pkgs/tools/misc/macchina/default.nix @@ -14,7 +14,7 @@ rustPlatform.buildRustPackage rec { src = fetchFromGitHub { owner = "Macchina-CLI"; repo = pname; - rev = "tags/release/v${version}"; + rev = "v${version}"; hash = "sha256-zbQOmlFWpoQwf4rlDLn1V0vj1c66pVWrMROGANRDl9s="; }; From 61113a7325ac9023b38ea43b4de95c6d53800e9f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 13 Jan 2023 02:40:21 +0000 Subject: [PATCH 35/49] glooctl: 1.13.1 -> 1.13.2 --- pkgs/applications/networking/cluster/glooctl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/glooctl/default.nix b/pkgs/applications/networking/cluster/glooctl/default.nix index afd41814dc30..57f507ba608b 100644 --- a/pkgs/applications/networking/cluster/glooctl/default.nix +++ b/pkgs/applications/networking/cluster/glooctl/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "glooctl"; - version = "1.13.1"; + version = "1.13.2"; src = fetchFromGitHub { owner = "solo-io"; repo = "gloo"; rev = "v${version}"; - hash = "sha256-dCMseU7rHxfyLCr+RlmsSJM7TSg3x/lQoCZpUtuPboQ="; + hash = "sha256-sCtRNdQRSPpIBSwtQMoetKmFLYUe3w1esogdkLqTHbk="; }; subPackages = [ "projects/gloo/cli/cmd" ]; - vendorSha256 = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; + vendorHash = "sha256-Lpc/fzOJLIyI2O5DP8K/LBYg6ZA1ixristercAM5VUQ="; nativeBuildInputs = [ installShellFiles ]; From 57f8101959a07c85f9bc32781263dae09d45c471 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 05:37:03 +0000 Subject: [PATCH 36/49] pocketbase: 0.10.4 -> 0.11.0 --- pkgs/servers/pocketbase/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/pocketbase/default.nix b/pkgs/servers/pocketbase/default.nix index fc5fc093dcd1..277a6c979de4 100644 --- a/pkgs/servers/pocketbase/default.nix +++ b/pkgs/servers/pocketbase/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "pocketbase"; - version = "0.10.4"; + version = "0.11.0"; src = fetchFromGitHub { owner = "pocketbase"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ma60DvoknvB1NN+DEq6CMnhSjcR/ACWCQSOYbyRlsCs="; + sha256 = "sha256-CKlmHOaBQZbaRc0kYacaVFhpG11CTA9Q1JPZCwDZjn0="; }; - vendorSha256 = "sha256-crVyKpvy7twZFDwwYNe+8GB0UAJ8j4F1yqYFu2CWW7o="; + vendorHash = "sha256-rNqZ49XbkS2c8XeSQg8igc5zM+NqWMb6dGsh4dakamI="; # This is the released subpackage from upstream repo subPackages = [ "examples/base" ]; From 0b71f973527514b7c5fba09482c16eefc3ad1756 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 10 Jan 2023 07:58:13 +0000 Subject: [PATCH 37/49] arkade: 0.8.52 -> 0.8.56 --- pkgs/applications/networking/cluster/arkade/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index fe59539efb54..9b0d76a5ac14 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -7,20 +7,20 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.52"; + version = "0.8.56"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-fKLvWlGJmhTvjcihJOytPvSNqhWOtJhWxMgw9gpc2M0="; + sha256 = "sha256-iU0/ovnclq/jwhi1d6zY4tz56ZB7FT0Mbpi2tEjb9QI="; }; CGO_ENABLED = 0; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "sha256-E2b0iJtOcRBOW4PEI/1ECM4fJa+s/LHtmRK/iYvJ358="; + vendorHash = "sha256-DsLW5l7TxlXRFZDhtRfq5YqVT3XR7EZGNIoPiksHNck="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ From 1592c7e4d4207a704244d11b529ed96a74be838c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Jan 2023 16:31:34 +0000 Subject: [PATCH 38/49] refurb: 1.8.0 -> 1.10.0 --- pkgs/development/tools/refurb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/refurb/default.nix b/pkgs/development/tools/refurb/default.nix index 89fc4e87438a..d216ca4b9162 100644 --- a/pkgs/development/tools/refurb/default.nix +++ b/pkgs/development/tools/refurb/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "refurb"; - version = "1.8.0"; + version = "1.10.0"; format = "pyproject"; src = fetchFromGitHub { owner = "dosisod"; repo = "refurb"; rev = "refs/tags/v${version}"; - hash = "sha256-dpPPhA5bVLiG9DsJ3RnO9RpCd0j4u5f//x/OTdlC+GQ="; + hash = "sha256-wb9E1BX9gjejZ5nTudzEPP+suX2eG4MPT07651+OY88="; }; nativeBuildInputs = with python3Packages; [ From c70e91bcc7c5a731d25ccfa3421715ec6e782058 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 11 Jan 2023 04:34:59 +0000 Subject: [PATCH 39/49] tcb: mark as glibc-only musl and UClibc, the other Linux libcs supported in Nixpkgs, don't have NSS, so tcb can't be built for them. --- pkgs/tools/security/tcb/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/tcb/default.nix b/pkgs/tools/security/tcb/default.nix index b49f7767dcbd..6a1f5b5eb5f2 100644 --- a/pkgs/tools/security/tcb/default.nix +++ b/pkgs/tools/security/tcb/default.nix @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://www.openwall.com/tcb/"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = systems.inspect.patterns.isGnu; maintainers = with maintainers; [ izorkin ]; }; } From 0debb0b193b5155433806c025a6f1946f9cab554 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 11 Jan 2023 04:35:24 +0000 Subject: [PATCH 40/49] shadow: only use tcb where available Fixes pkgsMusl.shadow. Fixes: 0e32191623d ("shadow: add tcb support") --- pkgs/os-specific/linux/shadow/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index 2d0e60716290..f0e2c281aa56 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -6,7 +6,7 @@ , libxcrypt , glibcCross ? null , pam ? null -, withTcb ? stdenv.isLinux, tcb +, withTcb ? lib.meta.availableOn stdenv.hostPlatform tcb, tcb }: let glibc = From 820f3452f4326a0aadb427a294d9b304a2b2f72e Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Wed, 11 Jan 2023 06:16:18 +0000 Subject: [PATCH 41/49] pkgsMusl.systemd: fix build by updating patchset --- pkgs/os-specific/linux/systemd/default.nix | 22 +++++----------------- 1 file changed, 5 insertions(+), 17 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 4c16e96fdb10..4329c8522839 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -6,7 +6,6 @@ , fetchFromGitHub , fetchpatch , fetchzip -, applyPatches , buildPackages , makeBinaryWrapper , ninja @@ -89,7 +88,7 @@ , withDocumentation ? true , withEfi ? stdenv.hostPlatform.isEfi && !stdenv.hostPlatform.isMusl , withFido2 ? true -, withHomed ? true +, withHomed ? !stdenv.hostPlatform.isMusl , withHostnamed ? true , withHwdb ? true , withImportd ? !stdenv.hostPlatform.isMusl @@ -177,20 +176,10 @@ stdenv.mkDerivation { ] ++ lib.optional stdenv.hostPlatform.isMusl ( let oe-core = fetchzip { - url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-d43ec090ceb2bf0016a065103a4c34d0c43cb906.tar.gz"; - sha256 = "sha256-e5rHmz0uyNgJwrAj96VGWWu9YHhZtJXoDpCtj17eC5w="; + url = "https://git.openembedded.org/openembedded-core/snapshot/openembedded-core-cccd4bcaf381c2729adc000381bd89906003e72a.tar.gz"; + sha256 = "2CFZEzWqUy6OOF3c+LN4Zmy3RqMzfdRHp+B5zlWJsoE="; }; - oe-core-patched = applyPatches { - src = oe-core; - patches = [ - (fetchpatch { - url = "https://lore.kernel.org/all/20221109002306.853567-1-raj.khem@gmail.com/raw"; - includes = [ "meta/recipes-core/systemd/systemd/*" ]; - sha256 = "sha256-aPJjN4vesZwFzgY4Nb6uaIuHz/quH1HccSVEof32IOU="; - }) - ]; - }; - musl-patches = oe-core-patched + "/meta/recipes-core/systemd/systemd"; + musl-patches = oe-core + "/meta/recipes-core/systemd/systemd"; in [ (musl-patches + "/0003-missing_type.h-add-comparison_fn_t.patch") @@ -212,8 +201,7 @@ stdenv.mkDerivation { (musl-patches + "/0001-pass-correct-parameters-to-getdents64.patch") (musl-patches + "/0002-Add-sys-stat.h-for-S_IFDIR.patch") (musl-patches + "/0001-Adjust-for-musl-headers.patch") - (musl-patches + "/0001-networkd-ipv4acd.c-Use-net-if.h-for-getting-IFF_LOOP.patch") - (musl-patches + "/0001-test-compile-test-utmp.c-only-if-UTMP-is-enabled.patch") + (musl-patches + "/0001-test-bus-error-strerror-is-assumed-to-be-GNU-specifi.patch") ] ); From d96f9582ea60118581f3476a346a4bf7dd3c49c7 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 03:07:15 +0000 Subject: [PATCH 42/49] =?UTF-8?q?terraform-providers.azuread:=202.31.0=20?= =?UTF-8?q?=E2=86=92=202.32.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a7be53563107..2f2ca4c4e6d6 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -121,11 +121,11 @@ "vendorHash": "sha256-L4EoUqkA5/nAs65G+mvXfFt/FzrCN/BmJoFSCP4PC7Q=" }, "azuread": { - "hash": "sha256-itaFeOEnoTIJfACvJZCIe9RWNVgewdVFZzXUK7yGglQ=", + "hash": "sha256-N+ty5O7sJbCp/rdQrwytOHzPFkaIvT5+1pOcoBQF1aw=", "homepage": "https://registry.terraform.io/providers/hashicorp/azuread", "owner": "hashicorp", "repo": "terraform-provider-azuread", - "rev": "v2.31.0", + "rev": "v2.32.0", "spdx": "MPL-2.0", "vendorHash": null }, From b59f8c0119fa88add1bf52a2dcc430ccdd4de271 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 03:12:42 +0000 Subject: [PATCH 43/49] =?UTF-8?q?terraform-providers.okta:=203.39.0=20?= =?UTF-8?q?=E2=86=92=203.40.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2f2ca4c4e6d6..6310d5277c16 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -825,13 +825,13 @@ "vendorHash": null }, "okta": { - "hash": "sha256-2AR416LkqgfHdY18m4k/jqSet7G77HwHuGKilvS3Yig=", + "hash": "sha256-+aHlFu49BxdFqrVCEIEqpg+o2i4d5F1uZipc//Qipaw=", "homepage": "https://registry.terraform.io/providers/okta/okta", "owner": "okta", "repo": "terraform-provider-okta", - "rev": "v3.39.0", + "rev": "v3.40.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-6dwFsEtlR3PtbshY6brauPN13seBmZda0Vkr65MAMhQ=" + "vendorHash": "sha256-XwQTtOsg1rktv/Oc+eTJ+Jr+BJvLEQPCaRSeXdXxWB0=" }, "oktaasa": { "hash": "sha256-2LhxgowqKvDDDOwdznusL52p2DKP+UiXALHcs9ZQd0U=", From 191f00e4723a781b5375985b62ea01131e2a4b91 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 03:15:38 +0000 Subject: [PATCH 44/49] =?UTF-8?q?terraform-providers.scaleway:=202.9.0=20?= =?UTF-8?q?=E2=86=92=202.9.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 6310d5277c16..a40719b21e71 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -969,13 +969,13 @@ "vendorHash": null }, "scaleway": { - "hash": "sha256-dxXEGAkmemTHmGvKOwe3+xVE+nP4CAr82JmL3Nh+BQA=", + "hash": "sha256-k02p6eoo152SWalGCX4iXhkE5xN55HpQ9A31j7wuIPE=", "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", "owner": "scaleway", "repo": "terraform-provider-scaleway", - "rev": "v2.9.0", + "rev": "v2.9.1", "spdx": "MPL-2.0", - "vendorHash": "sha256-bzx/Hl2JobtIa+ndvu1ssKg+faxt+JmJe4BL/go/0WY=" + "vendorHash": "sha256-FbWLXt7MFn/86NlSwCYpSV/6Ft3xRcESoNcVxM1A4ng=" }, "secret": { "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", From e3b2f11371c4a3d3c1758f39ee70ad440b40a38d Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 03:18:05 +0000 Subject: [PATCH 45/49] =?UTF-8?q?terraform-providers.snowflake:=200.55.0?= =?UTF-8?q?=20=E2=86=92=200.55.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index a40719b21e71..fc527ba0ad70 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1032,11 +1032,11 @@ "vendorHash": null }, "snowflake": { - "hash": "sha256-Ku6r5yUi30R7bXmChF+F+8YuMe/KKdrXrOIUtGMM1Fk=", + "hash": "sha256-QikYp81omjlSckr/2oXCmAqiJlcMWuR120z86fP/zkE=", "homepage": "https://registry.terraform.io/providers/Snowflake-Labs/snowflake", "owner": "Snowflake-Labs", "repo": "terraform-provider-snowflake", - "rev": "v0.55.0", + "rev": "v0.55.1", "spdx": "MIT", "vendorHash": "sha256-ulgTRY8qQ5oXONkwYtffRl1QMNnbvyn0zYiYqqvwrUU=" }, From 889e40a8a060049aa190adfa31126978cc81a8ed Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 03:18:14 +0000 Subject: [PATCH 46/49] =?UTF-8?q?terraform-providers.azurerm:=203.38.0=20?= =?UTF-8?q?=E2=86=92=203.39.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index fc527ba0ad70..2a2262030752 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -130,11 +130,11 @@ "vendorHash": null }, "azurerm": { - "hash": "sha256-ZLQV8hHh5U+qvBQovPxisPZ1BDUBH5YoKEt240bzQ0Y=", + "hash": "sha256-yCjfZruli5cIengL9f6ORsDWTY1BXwMr9g2Ohw+Q1Pc=", "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", "owner": "hashicorp", "repo": "terraform-provider-azurerm", - "rev": "v3.38.0", + "rev": "v3.39.0", "spdx": "MPL-2.0", "vendorHash": null }, From c3dab74711e1875357e49afc67dfe30996d4d0f8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 03:20:10 +0000 Subject: [PATCH 47/49] =?UTF-8?q?terraform-providers.spotinst:=201.90.0=20?= =?UTF-8?q?=E2=86=92=201.91.0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index 2a2262030752..c4e026483d14 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1050,13 +1050,13 @@ "vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8=" }, "spotinst": { - "hash": "sha256-OxpXh9wCsIjDSA6kDH9Gapkx0cWH8vFJoCxZu5FRPC8=", + "hash": "sha256-IhThsNLMHR29rOq1bDFsmySKFgvVxJ8twtjby6JxEc4=", "homepage": "https://registry.terraform.io/providers/spotinst/spotinst", "owner": "spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.90.0", + "rev": "v1.91.0", "spdx": "MPL-2.0", - "vendorHash": "sha256-L5nNi2DdchkjuWFOF7mOIiW3GzhDk6P66RQwyw0PhSM=" + "vendorHash": "sha256-imMuIXBCg2k9Cp78V4MMkb/bMWRbpxnCuLCFaQrBg3Q=" }, "stackpath": { "hash": "sha256-nTR9HgSmuNCt7wxE4qqIH2+HA2igzqVx0lLRx6FoKrE=", From 10c2c7c7b9c4246fda7849fcb58719007ca227d4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 13 Jan 2023 03:20:23 +0000 Subject: [PATCH 48/49] =?UTF-8?q?terraform-providers.vcd:=203.8.1=20?= =?UTF-8?q?=E2=86=92=203.8.2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../networking/cluster/terraform-providers/providers.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index c4e026483d14..525eb833d4f1 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -1187,13 +1187,13 @@ "vendorHash": "sha256-EOBNoEW9GI21IgXSiEN93B3skxfCrBkNwLxGXaso1oE=" }, "vcd": { - "hash": "sha256-Gpib9vgd8t//WJj7tuVEUYGf4HitqE/Kz8RyhMglKsw=", + "hash": "sha256-EG4WSnUZr/QfUT1qqOBOGze5Ztxp0HSB9Q1YYgLXQqk=", "homepage": "https://registry.terraform.io/providers/vmware/vcd", "owner": "vmware", "repo": "terraform-provider-vcd", - "rev": "v3.8.1", + "rev": "v3.8.2", "spdx": "MPL-2.0", - "vendorHash": "sha256-UT34mv0QN0Nq2+bRmAqFhslSzNe9iESUKEYLmjq9DRM=" + "vendorHash": "sha256-fDMS1ne6EKAqQjfE4QT1A0ChloXKCrgZPcftxzN/JwU=" }, "venafi": { "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=", From 3a5d557d03906ebfc7992987850f9dfd3044d450 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 12 Jan 2023 22:45:57 +0000 Subject: [PATCH 49/49] lttng-tools: 2.13.8 -> 2.13.9 --- pkgs/development/tools/misc/lttng-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index fdb0bfde7d40..01d62cac0e9e 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lttng-tools"; - version = "2.13.8"; + version = "2.13.9"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${pname}-${version}.tar.bz2"; - sha256 = "sha256-selZV5smB5CTCyDzx6p877ikDg3oDUp3fCv3jGs1PcE="; + sha256 = "sha256-jZTclbYIz3AhawEgOj+CQrl6Iy2y4jQhovQ3CNoI8zc="; }; nativeBuildInputs = [ pkg-config ];