From ebfbaaf2817c95fa1540460f1db35d31c576c902 Mon Sep 17 00:00:00 2001 From: Rafael Kraut <14234815+rafaelkr@users.noreply.github.com> Date: Mon, 22 Apr 2024 12:21:04 +0200 Subject: [PATCH 01/36] doc: remove discouraged enablePHP config from abstractions example In the initial configuration the enablePHP config option is present. In the following abstracted example the commonConfig doesn't include it anymore. Previous PRs #88505 and #284906 added the enablePHP config option to the commonConfig. @aanderse commented in https://github.com/NixOS/nixpkgs/pull/88505#issuecomment-632575200 the usage of enablePHP shouldn't be encouraged, `services.phpfpm` should be preferred whenever possible. So we remove the enablePHP config from theses examples. --- nixos/doc/manual/configuration/abstractions.section.md | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/doc/manual/configuration/abstractions.section.md b/nixos/doc/manual/configuration/abstractions.section.md index 5bc44aa72245..8e7f4d80fbc6 100644 --- a/nixos/doc/manual/configuration/abstractions.section.md +++ b/nixos/doc/manual/configuration/abstractions.section.md @@ -10,14 +10,12 @@ If you find yourself repeating yourself over and over, it’s time to abstract. adminAddr = "alice@example.org"; forceSSL = true; enableACME = true; - enablePHP = true; }; "wiki.example.org" = { documentRoot = "/webroot/wiki.example.org"; adminAddr = "alice@example.org"; forceSSL = true; enableACME = true; - enablePHP = true; }; }; } From 786428bb5a5caf32a79c90d9a012e44642903caa Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 16 Apr 2024 20:30:10 -0400 Subject: [PATCH 02/36] tplay: use rustPlatform.bindgenHook --- pkgs/by-name/tp/tplay/package.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/tp/tplay/package.nix b/pkgs/by-name/tp/tplay/package.nix index 4258bf6960cc..37bf1db7d198 100644 --- a/pkgs/by-name/tp/tplay/package.nix +++ b/pkgs/by-name/tp/tplay/package.nix @@ -29,7 +29,13 @@ rustPlatform.buildRustPackage rec { "--skip=pipeline::runner::tests::test_time_to_send_next_frame" ]; - nativeBuildInputs = [ pkg-config clang ffmpeg ]; + nativeBuildInputs = [ + rustPlatform.bindgenHook + pkg-config + clang + ffmpeg + ]; + buildInputs = [ openssl.dev alsa-lib.dev @@ -38,8 +44,6 @@ rustPlatform.buildRustPackage rec { opencv ]; - env.LIBCLANG_PATH = "${libclang.lib}/lib"; - meta = { description = "Terminal Media Player"; homepage = "https://github.com/maxcurzi/tplay"; From 88a5ce097507d5669df7cb95edc129fb681c2309 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 30 Apr 2024 09:48:45 -0400 Subject: [PATCH 03/36] materialize: drop redundant LIBCLANG_PATH --- pkgs/servers/sql/materialize/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/servers/sql/materialize/default.nix b/pkgs/servers/sql/materialize/default.nix index 90297cfa81ae..d31433db7f1f 100644 --- a/pkgs/servers/sql/materialize/default.nix +++ b/pkgs/servers/sql/materialize/default.nix @@ -70,7 +70,6 @@ rustPlatform.buildRustPackage rec { # needed for internal protobuf c wrapper library env.PROTOC = "${protobuf}/bin/protoc"; env.PROTOC_INCLUDE = "${protobuf}/include"; - env.LIBCLANG_PATH = "${libclang.lib}/lib"; # needed to dynamically link rdkafka env.CARGO_FEATURE_DYNAMIC_LINKING=1; From 7f2893f3f5e4ab400ea53076e8eb4768f83621fa Mon Sep 17 00:00:00 2001 From: "Vladyslav M." Date: Fri, 3 May 2024 12:23:20 +0300 Subject: [PATCH 04/36] linuxPackages.digimend: unstable-2023-05-03 -> 13 --- pkgs/os-specific/linux/digimend/default.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/digimend/default.nix b/pkgs/os-specific/linux/digimend/default.nix index 11756dcbe85c..a30d7cbe3a32 100644 --- a/pkgs/os-specific/linux/digimend/default.nix +++ b/pkgs/os-specific/linux/digimend/default.nix @@ -1,14 +1,19 @@ -{ lib, stdenv, fetchFromGitHub, kernel }: +{ + lib, + stdenv, + fetchFromGitHub, + kernel, +}: stdenv.mkDerivation rec { pname = "digimend"; - version = "unstable-2023-05-03"; + version = "13"; src = fetchFromGitHub { owner = "digimend"; repo = "digimend-kernel-drivers"; - rev = "eca6e1b701bffb80a293234a485ebf6b4bc85562"; - hash = "sha256-0mjIUgHvbNcVQVzU3xzaloe5R41a4eknDhdhruJH+6c="; + rev = "v${version}"; + hash = "sha256-YYCxTyoZGMnqC2nKkRi5Z1uofldGvJDGY2/sO9iMNIo="; }; postPatch = '' From 280392c3ac00ec823261f0aed7f3a7c1e9d3796d Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Fri, 3 May 2024 10:11:25 -0400 Subject: [PATCH 05/36] sing-box: 1.8.12 -> 1.8.13 Diff: https://github.com/SagerNet/sing-box/compare/v1.8.12...v1.8.13 --- pkgs/tools/networking/sing-box/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/sing-box/default.nix b/pkgs/tools/networking/sing-box/default.nix index 75ab85403951..7e47db4262c2 100644 --- a/pkgs/tools/networking/sing-box/default.nix +++ b/pkgs/tools/networking/sing-box/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "sing-box"; - version = "1.8.12"; + version = "1.8.13"; src = fetchFromGitHub { owner = "SagerNet"; repo = pname; rev = "v${version}"; - hash = "sha256-hgp4SzPJMeIaCxsuK7Y93h6E3KxK0KdNp+DCfv8UtiI="; + hash = "sha256-BFkf+Gdej/AsIL89obHEwchrw4IcZqjEkr/suYKbVKY="; }; - vendorHash = "sha256-4P36eTT7Q5+fZuPUGKEYal3NQ9WyEJxfNVoKJRIk6bo="; + vendorHash = "sha256-8OsUAknSuSJH1rRxMf8EVTUuIDHsIJauVI7hB4Fk1KU="; tags = [ "with_quic" From a4c899381e2ac4f02636efd09cc49f3454988d89 Mon Sep 17 00:00:00 2001 From: Peter Waller Date: Fri, 3 May 2024 15:25:35 +0100 Subject: [PATCH 06/36] julia.withPackages: Disable pretty terminal output during nix build Prior to this patch, julia would log output destined for a terminal which can support cursor movements, which we don't have while building under nix. The only way I could find to turn this off is to set CI=true during precompilation, which substantially reduces the amount of log output you end up with, to only the salient output (one line per package, instead of many identical lines being printed). Signed-off-by: Peter Waller --- pkgs/development/julia-modules/depot.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/julia-modules/depot.nix b/pkgs/development/julia-modules/depot.nix index 18bac9cb46a6..5614f1427aa5 100644 --- a/pkgs/development/julia-modules/depot.nix +++ b/pkgs/development/julia-modules/depot.nix @@ -55,6 +55,11 @@ runCommand "julia-depot" { # git config --global --add safe.directory '/nix' export JULIA_PKG_USE_CLI_GIT="true" + # At time of writing, this appears to be the only way to turn precompiling's + # terminal output into standard logging, so opportunistically do that. + # (Note this is different from JULIA_CI). + export CI=true + julia -e ' \ import Pkg import Pkg.Types: PRESERVE_NONE From f1ef4af8d76ba2f5993cf4f0d37a3f943f79e7b1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 15:13:20 +0000 Subject: [PATCH 07/36] balena-cli: 18.2.1 -> 18.2.2 --- pkgs/tools/admin/balena-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/admin/balena-cli/default.nix b/pkgs/tools/admin/balena-cli/default.nix index 58805192bde6..f4e681f80103 100644 --- a/pkgs/tools/admin/balena-cli/default.nix +++ b/pkgs/tools/admin/balena-cli/default.nix @@ -18,16 +18,16 @@ let }; in buildNpmPackage' rec { pname = "balena-cli"; - version = "18.2.1"; + version = "18.2.2"; src = fetchFromGitHub { owner = "balena-io"; repo = "balena-cli"; rev = "v${version}"; - hash = "sha256-UOA8YIY08ocRyr9DLOBBqgkzMxL5BKqy9UWrc3bPiDE="; + hash = "sha256-3WJ8yxSwvYOs8LaUBgqALyxY1cMiHusBPzKbSeAxrCw="; }; - npmDepsHash = "sha256-9atwUBU/L8vCepkFudW3JvzXX9/Neyi/ioc0vuuxsss="; + npmDepsHash = "sha256-sHjz0VWVM6x5iAbG9e6x4F6Gx2OpS94hDMvirExDt0M="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json From 1ee42882f31bb1e82858f9cbabb740cbc3c67a31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 15:13:42 +0000 Subject: [PATCH 08/36] hishtory: 0.292 -> 0.293 --- pkgs/shells/hishtory/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/hishtory/default.nix b/pkgs/shells/hishtory/default.nix index e1b4e5e33274..f6e7152ae9fc 100644 --- a/pkgs/shells/hishtory/default.nix +++ b/pkgs/shells/hishtory/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "hishtory"; - version = "0.292"; + version = "0.293"; src = fetchFromGitHub { owner = "ddworken"; repo = pname; rev = "v${version}"; - hash = "sha256-jCm/iSPKjQ0RRGw8bXPiKutMk/fM6mQ/Na6j+RrE0b4="; + hash = "sha256-5I61ey7GJ78dhSgRMkbRcKf3zk0j7zW2MyN2QSbAnpE="; }; - vendorHash = "sha256-9ZRhbRxQV9pzFzDhWIjgzQWXFWuzWMdeoNl4YsDuPFc="; + vendorHash = "sha256-zTwZ/sMhQdlf7RYfR2/K/m08U1Il0VQmYFyNNiYsWhc="; ldflags = [ "-X github.com/ddworken/hishtory/client/lib.Version=${version}" ]; From 0ea375cf9cc90e80628e39799629e34a08c48a7b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 15:32:49 +0000 Subject: [PATCH 09/36] tflint-plugins.tflint-ruleset-aws: 0.30.0 -> 0.31.0 --- .../tools/analysis/tflint-plugins/tflint-ruleset-aws.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix index 92a35d9b3bc3..a765966e35cb 100644 --- a/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix +++ b/pkgs/development/tools/analysis/tflint-plugins/tflint-ruleset-aws.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "tflint-ruleset-aws"; - version = "0.30.0"; + version = "0.31.0"; src = fetchFromGitHub { owner = "terraform-linters"; repo = pname; rev = "v${version}"; - hash = "sha256-mgYvzxIzh/HibPM+BQoJ7dKqEifMcuoqfOIZU4KcRC4="; + hash = "sha256-1ttqSRz++xJdpJIQ+rSCiGFhN5EJwW6tbAporc8J0LU="; }; - vendorHash = "sha256-JaOVNWF4JMXwGo+JVyknGZrd/M6F9c2PTgGadCqoRsk="; + vendorHash = "sha256-4QH/KehKBSNQhW8z/tk5ExAXKQNQ5Rl3RKyj+0jm/eI="; # upstream Makefile also does a go test $(go list ./... | grep -v integration) preCheck = '' From 711d5b0d05da7b32f5d9850cf19e8c32de9517de Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Sat, 4 May 2024 00:01:37 +0800 Subject: [PATCH 10/36] gnome-online-accounts-gtk: 3.50.1 -> 3.50.2 https://github.com/xapp-project/gnome-online-accounts-gtk/compare/3.50.1...3.50.2 --- pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix index 0cf51ced6f5d..d8dbbc5806b2 100644 --- a/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix +++ b/pkgs/by-name/gn/gnome-online-accounts-gtk/package.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "gnome-online-accounts-gtk"; - version = "3.50.1"; + version = "3.50.2"; src = fetchFromGitHub { owner = "xapp-project"; repo = "gnome-online-accounts-gtk"; rev = finalAttrs.version; - hash = "sha256-lirL1bsAZfuE669BdPo03M85O5eZzU/D/hfGp+LxvSo="; + hash = "sha256-6yGesg/L/9syX990uDuw5Or/uEQ8DGPQYiCRRw4OMzY="; }; nativeBuildInputs = [ From b41e30ee8f968f2865f9eeca78ce4ba9eaa72de7 Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 3 May 2024 20:23:56 +0530 Subject: [PATCH 11/36] eww: 0.6.0 -> 0.6.0-unstable-2024-04-26 use 2c8811512460ce6cc75e021d8d081813647699dc to fix string truncation bug https://github.com/elkowar/eww/pull/1084 --- pkgs/by-name/ew/eww/package.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index e60ad71ae9c2..1fc69cd48000 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -12,16 +12,19 @@ rustPlatform.buildRustPackage rec { pname = "eww"; - version = "0.6.0"; + version = "0.6.0-unstable-2024-04-26"; src = fetchFromGitHub { owner = "elkowar"; repo = "eww"; - rev = "refs/tags/v${version}"; - hash = "sha256-rzDnplFJNiHe+XbxbhZMEhPJMiJsmdVqtZxlxhzzpTk="; + # FIXME: change to a release tag once a new release is available + # https://github.com/elkowar/eww/pull/1084 + # using the revision to fix string truncation issue in eww config + rev = "2c8811512460ce6cc75e021d8d081813647699dc"; + hash = "sha256-eDOg5Ink3iWT/B1WpD9po5/UxS4DEaVO4NPIRyjSheM="; }; - cargoHash = "sha256-n9nd5E/VO+0BgkhrfQpeihlIkoVQRf6CMiPCK5opvvw="; + cargoHash = "sha256-ClnIW7HxbQcC85OyoMhBLFjVtdEUCOARuimfS4uRi+E="; nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; From f9e540adaee62ba6bb0f49074ee923e8b27bfb5a Mon Sep 17 00:00:00 2001 From: John Titor <50095635+JohnRTitor@users.noreply.github.com> Date: Fri, 3 May 2024 20:28:32 +0530 Subject: [PATCH 12/36] eww: update description, add long description reformat using nixfmt-rfc-style --- pkgs/by-name/ew/eww/package.nix | 27 +++++++++++++++++++++++---- 1 file changed, 23 insertions(+), 4 deletions(-) diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index 1fc69cd48000..76cd0eb46fab 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -26,7 +26,10 @@ rustPlatform.buildRustPackage rec { cargoHash = "sha256-ClnIW7HxbQcC85OyoMhBLFjVtdEUCOARuimfS4uRi+E="; - nativeBuildInputs = [ pkg-config wrapGAppsHook3 ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; buildInputs = [ gtk3 @@ -35,7 +38,10 @@ rustPlatform.buildRustPackage rec { librsvg ]; - cargoBuildFlags = [ "--bin" "eww" ]; + cargoBuildFlags = [ + "--bin" + "eww" + ]; cargoTestFlags = cargoBuildFlags; @@ -43,10 +49,23 @@ rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; meta = { - description = "ElKowars wacky widgets"; + description = "A widget system made in Rust to create widgets for any WM"; + longDescription = '' + Eww (ElKowar's Wacky Widgets) is a widget system made in Rust which lets + you create your own widgets similarly to how you can in AwesomeWM. + The key difference: It is independent of your window manager! + It can be configured in yuck and themed using CSS, is very easy + to customize and provides all the flexibility you need! + ''; homepage = "https://github.com/elkowar/eww"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ coffeeispower eclairevoyant figsoda lom w-lfchen ]; + maintainers = with lib.maintainers; [ + coffeeispower + eclairevoyant + figsoda + lom + w-lfchen + ]; mainProgram = "eww"; broken = stdenv.isDarwin; }; From ebdd2392bf1200ac9a2f8e21640db0d12f8a6fc7 Mon Sep 17 00:00:00 2001 From: tea Date: Fri, 3 May 2024 19:05:35 +0200 Subject: [PATCH 13/36] lib4sbom: init at 0.7.1 Closes #228377 --- pkgs/by-name/li/lib4sbom/package.nix | 57 ++++++++++++++++++++++++++++ 1 file changed, 57 insertions(+) create mode 100644 pkgs/by-name/li/lib4sbom/package.nix diff --git a/pkgs/by-name/li/lib4sbom/package.nix b/pkgs/by-name/li/lib4sbom/package.nix new file mode 100644 index 000000000000..c9c159f1b6ad --- /dev/null +++ b/pkgs/by-name/li/lib4sbom/package.nix @@ -0,0 +1,57 @@ +{ lib +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonPackage rec { + pname = "lib4sbom"; + version = "0.7.1"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "anthonyharrison"; + repo = pname; + rev = "v${version}"; + hash = "sha256-UQZZYTRDbUqSH6F8hjhp9L70025cRO3zXQ8Aoznotg4="; + }; + + propagatedBuildInputs = with python3Packages; [ + pyyaml + semantic-version + defusedxml + ]; + + nativeCheckInputs = with python3Packages; [ + pytestCheckHook + ]; + + disabledTests = [ + # stub tests that always fail + "TestCycloneDXGenerator" + "TestCcycloneDX_parser" + "TestGenerator" + "TestOutput" + "TestParser" + "TestSPDX_Generator" + "TestSPDX_Parser" + # tests with missing getters + "test_set_downloadlocation" + "test_set_homepage" + "test_set_checksum" + "test_set_externalreference" + # checks for invalid return type + "test_set_type" + # wrong capilatization + "test_set_supplier" + "test_set_originator" + ]; + + pythonImportsCheck = [ "lib4sbom" ]; + + meta = with lib; { + description = "Library to ingest and generate SBOMs"; + homepage = "https://github.com/anthonyharrison/lib4sbom"; + license = licenses.asl20; + maintainers = with maintainers; [ teatwig ]; + }; +} From fe9cdc468ac5ca49865d35ab5fe17a7a8ebc5940 Mon Sep 17 00:00:00 2001 From: savedram Date: Fri, 3 May 2024 17:48:44 +0100 Subject: [PATCH 14/36] clipse: 0.0.6 -> 0.0.71 clipse: 0.0.6 -> 0.0.71 clipse: 0.0.6 -> 0.0.71 clipse: 0.0.6 -> 0.0.71 --- pkgs/by-name/cl/clipse/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/cl/clipse/package.nix b/pkgs/by-name/cl/clipse/package.nix index af4b96385d16..e1cef9cfae54 100644 --- a/pkgs/by-name/cl/clipse/package.nix +++ b/pkgs/by-name/cl/clipse/package.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "clipse"; - version = "0.0.6"; + version = "0.0.71"; src = fetchFromGitHub { owner = "savedra1"; repo = "clipse"; rev = "v${version}"; - hash = "sha256-DLvYTPlLkp98zCzmbeL68B7mHl7RY3ee9rL30vYm5Ow="; + hash = "sha256-88GuYGJO5AgWae6LyMO/TpGqtk2yS7pDPS0MkgmJUQ4="; }; vendorHash = "sha256-GIUEx4h3xvLySjBAQKajby2cdH8ioHkv8aPskHN0V+w="; From abf0d76426a811bf483776b7e355fa7ce055ad9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20Fern=C3=A1ndez=20L=C3=B3pez?= Date: Fri, 3 May 2024 19:31:05 +0200 Subject: [PATCH 15/36] wasmtime: 20.0.0 -> 20.0.1 --- pkgs/development/interpreters/wasmtime/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/wasmtime/default.nix b/pkgs/development/interpreters/wasmtime/default.nix index 545c176ab472..088ef8ba9a90 100644 --- a/pkgs/development/interpreters/wasmtime/default.nix +++ b/pkgs/development/interpreters/wasmtime/default.nix @@ -2,19 +2,19 @@ rustPlatform.buildRustPackage rec { pname = "wasmtime"; - version = "20.0.0"; + version = "20.0.1"; src = fetchFromGitHub { owner = "bytecodealliance"; repo = pname; rev = "v${version}"; - hash = "sha256-Q2CsIwYQsLnAlGyMRxNTxjZsezxhjSptBF540NtgkCc="; + hash = "sha256-Qgeg/TYjbfzDEXTPqS6GkTOQrLMGc6D3vochuJSqas0="; fetchSubmodules = true; }; # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. auditable = false; - cargoHash = "sha256-d956DuVtLbZ/u3sAA4cQlw55CuYC7XyzeQarwyQ/hpY="; + cargoHash = "sha256-HfTwN53j60sG3mcWPEKeveyf7sEbI2746pTJSn6Zlp0="; cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; outputs = [ "out" "dev" ]; From 8cf964efcdf3241ece74db28741268633b1908ec Mon Sep 17 00:00:00 2001 From: tea Date: Fri, 3 May 2024 19:07:34 +0200 Subject: [PATCH 16/36] cve-bin-util: 3.2 -> 3.3 --- pkgs/tools/security/cve-bin-tool/default.nix | 62 ++++--------------- .../no-gsutil-python-dependency.patch | 12 ---- 2 files changed, 11 insertions(+), 63 deletions(-) delete mode 100644 pkgs/tools/security/cve-bin-tool/no-gsutil-python-dependency.patch diff --git a/pkgs/tools/security/cve-bin-tool/default.nix b/pkgs/tools/security/cve-bin-tool/default.nix index 88b52da21eb3..67b882ee103f 100644 --- a/pkgs/tools/security/cve-bin-tool/default.nix +++ b/pkgs/tools/security/cve-bin-tool/default.nix @@ -1,8 +1,11 @@ { lib , buildPythonApplication , fetchFromGitHub -, fetchpatch +, filetype , jsonschema +, lib4sbom +, packageurl-python +, python-gnupg , plotly , beautifulsoup4 , pyyaml @@ -30,67 +33,20 @@ , pip , testers , cve-bin-tool -# pinned packaging -, pyparsing -, fetchPypi -, buildPythonPackage -, pretend -, pythonOlder -, wheel }: -let - # pin packaging to < 22 until issue related to https://github.com/intel/cve-bin-tool/pull/2436 are resolved by upstream (post-3.2) - packaging_21_3 = buildPythonPackage rec { - inherit (packaging) pname passthru meta; - version = "21.3"; - format = "pyproject"; - disabled = pythonOlder "3.6"; - - src = fetchPypi { - inherit pname version; - sha256 = "sha256-3UfEKSfYmrkR5gZRiQfMLTofOLvQJjhZcGQ/nFuOz+s="; - }; - nativeBuildInputs = [ - setuptools - wheel - ]; - propagatedBuildInputs = [ - pyparsing - ]; - - nativeCheckInputs = [ - pytestCheckHook - pretend - ]; - - doCheck = false; - }; -in buildPythonApplication rec { pname = "cve-bin-tool"; - version = "3.2"; + version = "3.3"; format = "setuptools"; src = fetchFromGitHub { owner = "intel"; repo = "cve-bin-tool"; rev = "refs/tags/v${version}"; - hash = "sha256-QOnWt6iit0/F6d/MfZ8qJqDuT3IHh0Qjs6BcJkI/CBw="; + hash = "sha256-A5w4U5EDX+UZWNMuz8GTOcubo8N2KfDlVV0aRNsO8/E="; }; - patches = [ - # Not needed as python dependency, should just be on the PATH - ./no-gsutil-python-dependency.patch - # Already merged upstream, to be removed post-3.2 - # https://github.com/intel/cve-bin-tool/pull/2524 - (fetchpatch { - name = "cve-bin-tool-version-success.patch"; - url = "https://github.com/intel/cve-bin-tool/commit/6f9bd565219932c565c1443ac467fe4163408dd8.patch"; - hash = "sha256-Glj6qiOvmvsuetXn4tysyiN/vrcOPFLORh+u3BoGzCI="; - }) - ]; - # Wants to open a sqlite database, access the internet, etc doCheck = false; @@ -100,7 +56,11 @@ buildPythonApplication rec { propagatedBuildInputs = [ google-cloud-sdk + filetype jsonschema + lib4sbom + packageurl-python + python-gnupg plotly beautifulsoup4 pyyaml @@ -123,7 +83,7 @@ buildPythonApplication rec { setuptools xmlschema cvss - packaging_21_3 + packaging ]; nativeCheckInputs = [ diff --git a/pkgs/tools/security/cve-bin-tool/no-gsutil-python-dependency.patch b/pkgs/tools/security/cve-bin-tool/no-gsutil-python-dependency.patch deleted file mode 100644 index 9bbac57b5fb4..000000000000 --- a/pkgs/tools/security/cve-bin-tool/no-gsutil-python-dependency.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/requirements.txt b/requirements.txt -index 1d4aa9a..c9e9171 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -14,6 +14,6 @@ xmlschema - importlib_metadata; python_version < "3.8" - requests - urllib3>=1.26.5 # dependency of requests added explictly to avoid CVEs --gsutil -+#gsutil - cvss - packaging From a784b9d9a869be5878c39ce9aa262e9c1bbb8968 Mon Sep 17 00:00:00 2001 From: TomaSajt <62384384+TomaSajt@users.noreply.github.com> Date: Fri, 3 May 2024 19:59:43 +0200 Subject: [PATCH 17/36] jitsi-meet-electron: set ELECTRON_IS_DEV instead of substituting --- .../instant-messengers/jitsi-meet-electron/default.nix | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix index 83a3b78e1d4b..a0968f83ddee 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi-meet-electron/default.nix @@ -43,11 +43,6 @@ buildNpmPackage rec { env.ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - postPatch = '' - substituteInPlace main.js \ - --replace "require('electron-is-dev')" "false" - ''; - preBuild = '' # remove some prebuilt binaries find node_modules -type d -name prebuilds -exec rm -r {} + @@ -72,6 +67,7 @@ buildNpmPackage rec { makeWrapper ${lib.getExe electron} $out/bin/jitsi-meet-electron \ --add-flags $out/share/jitsi-meet-electron/resources/app.asar \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --set-default ELECTRON_IS_DEV 0 \ --inherit-argv0 install -Dm644 resources/icons/512x512.png $out/share/icons/hicolor/512x512/apps/jitsi-meet-electron.png From e08db1210ab650c47ef6add5c5efe3cce87b1dd2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 18:40:42 +0000 Subject: [PATCH 18/36] wio: unstable-2024-03-23 -> 0.17.3-unstable-2024-04-30 --- pkgs/by-name/wi/wio/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/wi/wio/package.nix b/pkgs/by-name/wi/wio/package.nix index 5a39e30ea3be..5982f80cef36 100644 --- a/pkgs/by-name/wi/wio/package.nix +++ b/pkgs/by-name/wi/wio/package.nix @@ -20,13 +20,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "wio"; - version = "unstable-2024-03-23"; + version = "0.17.3-unstable-2024-04-30"; src = fetchFromGitHub { owner = "Rubo3"; repo = "wio"; - rev = "a68fbaf0011610d55db0413ebb7aca6ff79a8dc3"; - hash = "sha256-iQulldgYuz++ank2rOL92Ydj6IOiBtNEVEEcVOlhkMk="; + rev = "9d459df379efdcf20ea10906c48c79c506c32066"; + hash = "sha256-Bn7mCVQPH/kH2WRsGPPGIGgvk0r894zZHCHl6BVmWVg="; }; nativeBuildInputs = [ From 47f41eddfda90bdd9712d8291c9acac1ce6034af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 19 Apr 2024 21:12:11 +0200 Subject: [PATCH 19/36] dunst: 1.10.0 -> 1.11.0 --- pkgs/by-name/du/dunst/package.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index f89bcd196ab3..6e25bd3066eb 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "dunst"; - version = "1.10.0"; + version = "1.11.0"; src = fetchFromGitHub { owner = "dunst-project"; repo = "dunst"; rev = "v${finalAttrs.version}"; - hash = "sha256-6smFUdWqOuYB0btsDgHtIpDBfHhkpIQfjyZ8wtRg1bQ="; + hash = "sha256-eiFvvavXGNcHZnEGwlTLxRqFNdkvEZMwNIkVyDn1V6o="; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; @@ -42,10 +42,8 @@ stdenv.mkDerivation (finalAttrs: { wrapProgram $out/bin/dunstctl \ --prefix PATH : "${lib.makeBinPath [ coreutils dbus ]}" - install -D contrib/_dunst.zshcomp $out/share/zsh/site-functions/_dunst - install -D contrib/_dunstctl.zshcomp $out/share/zsh/site-functions/_dunstctl - substituteInPlace $out/share/zsh/site-functions/_dunstctl \ - --replace "jq -M" "${jq}/bin/jq -M" + substituteInPlace $out/share/zsh/site-functions/_dunstctl $out/share/fish/vendor_completions.d/{dunstctl,dunstify} \ + --replace-fail "jq" "${lib.getExe jq}" ''; passthru.tests.version = testers.testVersion { package = dunst; }; From afcfcd2f94b0f949e04688ddabd6ae2b5f5069e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 19 Apr 2024 22:44:25 +0200 Subject: [PATCH 20/36] dunst: add options for X and Wayland support --- pkgs/by-name/du/dunst/package.nix | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index 6e25bd3066eb..c40e275affc1 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -4,6 +4,7 @@ , wayland, wayland-protocols , libXinerama, libnotify, pango, xorgproto, librsvg , testers, dunst +, withX11 ? true, withWayland ? true }: stdenv.mkDerivation (finalAttrs: { @@ -20,10 +21,11 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; buildInputs = [ - cairo dbus gdk-pixbuf glib libX11 libXScrnSaver - libXinerama libnotify pango xorgproto librsvg libXrandr - wayland wayland-protocols - ]; + cairo dbus gdk-pixbuf glib + libnotify pango librsvg + ] + ++ lib.optionals withX11 [ libX11 libXScrnSaver libXinerama xorgproto libXrandr] + ++ lib.optionals withWayland [ wayland wayland-protocols ]; outputs = [ "out" "man" ]; @@ -33,7 +35,9 @@ stdenv.mkDerivation (finalAttrs: { "SYSCONFDIR=$(out)/etc" "SERVICEDIR_DBUS=$(out)/share/dbus-1/services" "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" - ]; + ] + ++ lib.optional (!withX11) "X11=0" + ++ lib.optional (!withWayland) "WAYLAND=0"; postInstall = '' wrapProgram $out/bin/dunst \ From 2a533953c563324c29e7f64eeb2dda09fa254666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 19 Apr 2024 23:18:13 +0200 Subject: [PATCH 21/36] dunst: format with nixpkgs-fmt --- pkgs/by-name/du/dunst/package.nix | 65 ++++++++++++++++++++++++------- 1 file changed, 52 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index c40e275affc1..360b5ce7defb 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -1,10 +1,31 @@ -{ stdenv, lib, fetchFromGitHub, makeWrapper -, pkg-config, which, perl, jq, libXrandr, coreutils -, cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver -, wayland, wayland-protocols -, libXinerama, libnotify, pango, xorgproto, librsvg -, testers, dunst -, withX11 ? true, withWayland ? true +{ stdenv +, lib +, fetchFromGitHub +, makeWrapper +, pkg-config +, which +, perl +, jq +, libXrandr +, coreutils +, cairo +, dbus +, systemd +, gdk-pixbuf +, glib +, libX11 +, libXScrnSaver +, wayland +, wayland-protocols +, libXinerama +, libnotify +, pango +, xorgproto +, librsvg +, testers +, dunst +, withX11 ? true +, withWayland ? true }: stdenv.mkDerivation (finalAttrs: { @@ -18,14 +39,32 @@ stdenv.mkDerivation (finalAttrs: { hash = "sha256-eiFvvavXGNcHZnEGwlTLxRqFNdkvEZMwNIkVyDn1V6o="; }; - nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; + nativeBuildInputs = [ + perl + pkg-config + which + systemd + makeWrapper + ]; buildInputs = [ - cairo dbus gdk-pixbuf glib - libnotify pango librsvg - ] - ++ lib.optionals withX11 [ libX11 libXScrnSaver libXinerama xorgproto libXrandr] - ++ lib.optionals withWayland [ wayland wayland-protocols ]; + cairo + dbus + gdk-pixbuf + glib + libnotify + pango + librsvg + ] ++ lib.optionals withX11 [ + libX11 + libXScrnSaver + libXinerama + xorgproto + libXrandr + ] ++ lib.optionals withWayland [ + wayland + wayland-protocols + ]; outputs = [ "out" "man" ]; From 8168cd0342eca81217cd77d537ad41f9ed23cfe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gutyina=20Gerg=C5=91?= Date: Fri, 19 Apr 2024 22:52:32 +0200 Subject: [PATCH 22/36] dunst: add maintainer gepbird --- pkgs/by-name/du/dunst/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index 360b5ce7defb..f01f65c86283 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -97,7 +97,7 @@ stdenv.mkDerivation (finalAttrs: { license = licenses.bsd3; # NOTE: 'unix' or even 'all' COULD work too, I'm not sure platforms = platforms.linux; - maintainers = with maintainers; [ domenkozar ]; + maintainers = with maintainers; [ domenkozar gepbird ]; mainProgram = "dunst"; }; }) From 759c4539004e442863ebd487c0d25319a94720c9 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Fri, 3 May 2024 23:38:56 +0200 Subject: [PATCH 23/36] zed-editor: 0.133.5 -> 0.133.7 Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.133.5...0.133.7 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.133.7 --- pkgs/by-name/ze/zed-editor/Cargo.lock | 3 ++- pkgs/by-name/ze/zed-editor/package.nix | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index b45efeb690f5..fd193939f3de 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -4088,6 +4088,7 @@ name = "fsevent" version = "0.1.0" dependencies = [ "bitflags 2.4.2", + "core-foundation", "fsevent-sys 3.1.0", "parking_lot", "tempfile", @@ -12607,7 +12608,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.133.5" +version = "0.133.7" dependencies = [ "activity_indicator", "anyhow", diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 9c79b602b469..cc33e17a3f35 100644 --- a/pkgs/by-name/ze/zed-editor/package.nix +++ b/pkgs/by-name/ze/zed-editor/package.nix @@ -27,13 +27,13 @@ rustPlatform.buildRustPackage rec { pname = "zed"; - version = "0.133.5"; + version = "0.133.7"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-52vWOlaxVcjlKLrBW+anh6i7kfBCD5cTHWcjLFiY9BA="; + hash = "sha256-alhOAcp4aika+v9FWnM2UWVLmzXnAhJD0z2WnYwDN8k="; fetchSubmodules = true; }; From c005634cfd544c586770ed7ad43465c12116a1f8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 22:01:32 +0000 Subject: [PATCH 24/36] python311Packages.boto3-stubs: 1.34.96 -> 1.34.98 --- pkgs/development/python-modules/boto3-stubs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3-stubs/default.nix b/pkgs/development/python-modules/boto3-stubs/default.nix index 1d7e839665c9..e0810d717f4f 100644 --- a/pkgs/development/python-modules/boto3-stubs/default.nix +++ b/pkgs/development/python-modules/boto3-stubs/default.nix @@ -366,7 +366,7 @@ buildPythonPackage rec { pname = "boto3-stubs"; - version = "1.34.96"; + version = "1.34.98"; pyproject = true; disabled = pythonOlder "3.7"; @@ -374,7 +374,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "boto3_stubs"; inherit version; - hash = "sha256-gkpimXGE45wP34h7JCxEodaauH4hVMKzHVDGSvqKT8U="; + hash = "sha256-LhkC5wBmIBa3M5wOwCqCqL+hJ3Dc2Ga1WoWY+A7nNUs="; }; build-system = [ setuptools ]; From 79f1e0f2943637b0f01618337d5c4b7db7bf9c5e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 22:01:41 +0000 Subject: [PATCH 25/36] argocd: 2.10.8 -> 2.10.9 --- pkgs/applications/networking/cluster/argocd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/argocd/default.nix b/pkgs/applications/networking/cluster/argocd/default.nix index 761e7f0d1d7b..d2937f86a175 100644 --- a/pkgs/applications/networking/cluster/argocd/default.nix +++ b/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "argocd"; - version = "2.10.8"; + version = "2.10.9"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = "v${version}"; - hash = "sha256-VzEgZshzIHXI0J172W1zI1E8dU8iYJq0lO01LpI8Y+U="; + hash = "sha256-0f+YXhxALbT+X1U0rmG+6IKqvzz8hvYSXS3YUpu+WWs="; }; proxyVendor = true; # darwin/linux hash mismatch - vendorHash = "sha256-dgj8IXrLNZ6ZEIFAY/gXAklVKfLXosRuR1SyZWkwrwA="; + vendorHash = "sha256-42OWsNUFTLrx8FztxsCSHCxGb3yAv8qBKnN+EEIRCaA="; # Set target as ./cmd per cli-local # https://github.com/argoproj/argo-cd/blob/master/Makefile#L227 From f918a941c2b8a5052843268e4d07f1cfd02c23c7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 22:15:42 +0000 Subject: [PATCH 26/36] cilium-cli: 0.16.5 -> 0.16.6 --- pkgs/applications/networking/cluster/cilium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix index 34a83ed1c8b3..6b097500bacc 100644 --- a/pkgs/applications/networking/cluster/cilium/default.nix +++ b/pkgs/applications/networking/cluster/cilium/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cilium-cli"; - version = "0.16.5"; + version = "0.16.6"; src = fetchFromGitHub { owner = "cilium"; repo = pname; rev = "v${version}"; - hash = "sha256-XsdvjdhrTin5RWwDjBBpdBM/+1S/p+MMd/2gigOiz2E="; + hash = "sha256-MeBwlwxjMcBMy62IlhWBB+hTM5/Z9uIlqfCWsj0SQ4g="; }; vendorHash = null; From 5cd1c9af08e6f4b8b26ee5a82350f68a686edb4d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 4 May 2024 00:23:57 +0200 Subject: [PATCH 27/36] python312Packages.nettigo-air-monitor: 3.0.0 -> 3.0.1 Diff: https://github.com/bieniu/nettigo-air-monitor/compare/refs/tags/3.0.0...3.0.1 Changelog: https://github.com/bieniu/nettigo-air-monitor/releases/tag/3.0.1 --- .../python-modules/nettigo-air-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix index a33f9d528630..f450b85abd1e 100644 --- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix +++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "nettigo-air-monitor"; - version = "3.0.0"; + version = "3.0.1"; pyproject = true; disabled = pythonOlder "3.11"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bieniu"; repo = "nettigo-air-monitor"; rev = "refs/tags/${version}"; - hash = "sha256-aiJoY+6sNfBmE1057UuMjV80hjVJ29t2X16IIe6dxWs="; + hash = "sha256-Ysvyg2cj09Bb+xpNPapYAQSBDKfGsYZcHj9xxIR8KGw="; }; build-system = [ setuptools ]; From e51129c992704bfb9f38d90a2a2209f0f92f6ddd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 22:30:15 +0000 Subject: [PATCH 28/36] git-credential-oauth: 0.11.2 -> 0.11.3 --- .../version-management/git-credential-oauth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-credential-oauth/default.nix b/pkgs/applications/version-management/git-credential-oauth/default.nix index 5672fb95e499..edc517b54d59 100644 --- a/pkgs/applications/version-management/git-credential-oauth/default.nix +++ b/pkgs/applications/version-management/git-credential-oauth/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "git-credential-oauth"; - version = "0.11.2"; + version = "0.11.3"; src = fetchFromGitHub { owner = "hickford"; repo = pname; rev = "v${version}"; - hash = "sha256-dGn1I47/S6DYXva5zjvcQnB+I4Ex354xMmZ/3OkpjMw="; + hash = "sha256-tJJxCtCNuPtoQYABEViS1G6aHrMTLn+r3hlTTkaJvCg="; }; nativeBuildInputs = [ installShellFiles ]; From c00ca0e790967f424fdea81a241fe844b38a45c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 22:58:11 +0000 Subject: [PATCH 29/36] libretro.beetle-psx-hw: unstable-2024-04-26 -> unstable-2024-05-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d0fbc4f33836..683cc7c7a325 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -85,10 +85,10 @@ "src": { "owner": "libretro", "repo": "beetle-psx-libretro", - "rev": "866df6445c9863ba03395211cd814224a59f7511", - "hash": "sha256-D0Qv6EOAOfmoScv8EzqWbr8SLRl8lH5Rqj/BksQe70k=" + "rev": "54afe0284292fc6b83b9d515c86a553a8127a984", + "hash": "sha256-VZq8AZzjnTFh0GHh1mGIVAznTtJ+g0TJwTAXPUJdmI4=" }, - "version": "unstable-2024-04-26" + "version": "unstable-2024-05-03" }, "beetle-saturn": { "fetcher": "fetchFromGitHub", From b72ed9eb36a0e0696d80b11ce165fe57268d80bd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 23:09:23 +0000 Subject: [PATCH 30/36] libretro.beetle-pce-fast: unstable-2024-04-26 -> unstable-2024-05-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d0fbc4f33836..760b5c502960 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -65,10 +65,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-fast-libretro", - "rev": "be9db7587571893377974575b7c9768e00833bc2", - "hash": "sha256-vmqJvfYJDriWf8UL79DgX6EG3YFGQMvo7xosK/1FdrA=" + "rev": "e2c0259a6941285f853bdc81dfd33756e107c2c2", + "hash": "sha256-S5p38rC5JqLL7ydeEtYR29rWFx1Pok3s7SNPr9zKwb8=" }, - "version": "unstable-2024-04-26" + "version": "unstable-2024-05-03" }, "beetle-pcfx": { "fetcher": "fetchFromGitHub", From 2cf70953d8817c0be8df57a00301d637da79123a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 3 May 2024 23:11:14 +0000 Subject: [PATCH 31/36] libretro.beetle-pce: unstable-2024-04-26 -> unstable-2024-05-03 --- pkgs/applications/emulators/retroarch/hashes.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d0fbc4f33836..4e6095313230 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,10 +55,10 @@ "src": { "owner": "libretro", "repo": "beetle-pce-libretro", - "rev": "ebd9f3f003f1268142785e41943e51616c3802b0", - "hash": "sha256-ccPMRfCzbFF509Q683rTo23tazk1jdeEbZVWMPpC55U=" + "rev": "b5dd6466f18714ab4c9702e5bdb51cc9dfea061b", + "hash": "sha256-PBirwijCwaOcjRdyIyx/UsnYMQuojQuogK7X7Hte7r8=" }, - "version": "unstable-2024-04-26" + "version": "unstable-2024-05-03" }, "beetle-pce-fast": { "fetcher": "fetchFromGitHub", From ab02075e58688b326de26a171661ea38708464b5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 4 May 2024 00:42:40 +0000 Subject: [PATCH 32/36] agola: 0.8.0 -> 0.9.1 --- .../tools/continuous-integration/agola/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/agola/default.nix b/pkgs/development/tools/continuous-integration/agola/default.nix index 02cd0f25acd5..9022e0b171bb 100644 --- a/pkgs/development/tools/continuous-integration/agola/default.nix +++ b/pkgs/development/tools/continuous-integration/agola/default.nix @@ -4,7 +4,7 @@ }: let - version = "0.8.0"; + version = "0.9.1"; in buildGoModule { @@ -15,10 +15,10 @@ buildGoModule { owner = "agola-io"; repo = "agola"; rev = "v${version}"; - hash = "sha256-nU04MVkUC+m6Ga4qDUH9KrA0zbYmttAicpvdxbaBG0Y="; + hash = "sha256-96D4E4H3JsXCHWUyTKzZxqsqylJdzbnbLi6engNR/Eg="; }; - vendorHash = "sha256-k3Sip9CqTGRTWxr3RzZf0jCrm4AfUrpY/wSTmHy+yik="; + vendorHash = "sha256-Igtccundx/2PHFp8+L44CvOLG+/Ndinhonh/EDcQeoY="; ldflags = [ "-s" From 7147b6bc27446034bda87f596e988ce6863ecd10 Mon Sep 17 00:00:00 2001 From: RaySlash Date: Thu, 2 May 2024 19:40:28 +1000 Subject: [PATCH 33/36] yofi: init at 0.2.2 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: éclairevoyant <848000+eclairevoyant@users.noreply.github.com> --- pkgs/by-name/yo/yofi/package.nix | 50 ++++++++++++++++++++++++++++++++ 1 file changed, 50 insertions(+) create mode 100644 pkgs/by-name/yo/yofi/package.nix diff --git a/pkgs/by-name/yo/yofi/package.nix b/pkgs/by-name/yo/yofi/package.nix new file mode 100644 index 000000000000..5227efa6fe7e --- /dev/null +++ b/pkgs/by-name/yo/yofi/package.nix @@ -0,0 +1,50 @@ +{ lib +, fetchFromGitHub +, rustPlatform +, autoPatchelfHook +, fontconfig +, libxkbcommon +, pkg-config +, libgcc +, wayland +}: +rustPlatform.buildRustPackage rec { + pname = "yofi"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "l4l"; + repo = "yofi"; + rev = "refs/tags/${version}"; + hash = "sha256-cepAZyA4RBgqeF20g6YOlZTM0aRqErw17yuQ3U24UEg="; + }; + + cargoHash = "sha256-iSy/y1iwhR8x3wDIfazMeROSrJ8uRyA10hoNo6y2OQc="; + nativeBuildInputs = [ + autoPatchelfHook + pkg-config + ]; + + buildInputs = [ + libgcc + libxkbcommon + ]; + + appendRunpaths = [ + (lib.makeLibraryPath [ fontconfig wayland ]) + ]; + + checkFlags = [ + # Fail to run in sandbox environment. + "--skip=screen::context::test" + ]; + + meta = { + description = "A minimalist app launcher in Rust"; + homepage = "https://github.com/l4l/yofi"; + license = lib.licenses.mit; + platforms = lib.platforms.linux; + maintainers = with lib.maintainers; [ rayslash ]; + mainProgram = "yofi"; + }; +} From 5f3e8db69144e291a3bfc74e205825b5bfd22ff0 Mon Sep 17 00:00:00 2001 From: Jean-Francois Chevrette Date: Fri, 3 May 2024 22:49:56 -0400 Subject: [PATCH 34/36] rosa: 1.2.36 -> 1.2.38 (#308534) * rosa: 1.2.36 -> 1.2.38 * disable tests requiring network access - e2e tests require network access - TestRhRegionCommand require network access --- pkgs/by-name/ro/rosa/package.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ro/rosa/package.nix b/pkgs/by-name/ro/rosa/package.nix index c50ca87e821b..b9156afa9df8 100644 --- a/pkgs/by-name/ro/rosa/package.nix +++ b/pkgs/by-name/ro/rosa/package.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rosa"; - version = "1.2.36"; + version = "1.2.38"; src = fetchFromGitHub { owner = "openshift"; repo = "rosa"; rev = "v${version}"; - hash = "sha256-jdLMQLbk446QJ+8+HjTCTjtlCuLlZZsLUBInRg4UMH0="; + hash = "sha256-eS9mK5iK/fXWMpgA/RF7wYybcJtPDW/pIWo9Iw0I+K8="; }; vendorHash = null; @@ -16,6 +16,18 @@ buildGoModule rec { __darwinAllowLocalNetworking = true; + postPatch = '' + # e2e tests require network access + rm -r tests/e2e + ''; + + preCheck = '' + # Workaround for cmd/list/rhRegion/cmd_test.go:39 + # Failed to get OCM regions: Can't retrieve shards: Get "https://api.stage.openshift.com/static/ocm-shards.json": dial tcp: lookup api.stage.openshift.com on [::1]:53: read udp [::1]:55793->[::1]:53: read: connection refused + substituteInPlace "cmd/list/rhRegion/cmd_test.go" \ + --replace-fail "TestRhRegionCommand" "SkipRhRegionCommand" + ''; + nativeBuildInputs = [ installShellFiles ]; postInstall = '' installShellCompletion --cmd rosa \ From a013465da267a19c3f5134afa1bd42caa62ec330 Mon Sep 17 00:00:00 2001 From: Valter Nazianzeno Date: Fri, 3 May 2024 23:55:38 -0300 Subject: [PATCH 35/36] emilua: 0.6.0 -> 0.7.2 (#308155) --- .../interpreters/emilua/default.nix | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/emilua/default.nix b/pkgs/development/interpreters/emilua/default.nix index 03ba8d81cfcd..97fc3089404a 100644 --- a/pkgs/development/interpreters/emilua/default.nix +++ b/pkgs/development/interpreters/emilua/default.nix @@ -20,6 +20,7 @@ , cereal , cmake , asciidoctor +, makeWrapper }: let @@ -33,13 +34,13 @@ let in stdenv.mkDerivation rec { pname = "emilua"; - version = "0.6.0"; + version = "0.7.2"; src = fetchFromGitLab { owner = "emilua"; repo = "emilua"; rev = "v${version}"; - hash = "sha256-cW2b+jUQT60hCCirBzxZltzA7KvBihnzWNPkKDID6kU="; + hash = "sha256-gt+THEr3nilweDEDmEMwIsU4i9own4ICJlZD+z8XWRQ="; }; buildInputs = [ @@ -64,6 +65,7 @@ stdenv.mkDerivation rec { meson cmake ninja + makeWrapper ]; dontUseCmakeConfigure = true; @@ -81,6 +83,7 @@ stdenv.mkDerivation rec { (lib.mesonBool "enable_tests" true) (lib.mesonBool "enable_manpages" true) (lib.mesonOption "version_suffix" "-nixpkgs1") + (lib.mesonOption "ipc_actor_msg_max_members_number" "40") ]; postPatch = '' @@ -90,7 +93,17 @@ stdenv.mkDerivation rec { cp "packagefiles/trial.protocol/meson.build" "trial-protocol/" popd - substituteInPlace src/emilua_gperf.awk --replace '#!/usr/bin/env -S gawk --file' '#!${gawk}/bin/gawk -f' + patchShebangs src/emilua_gperf.awk --interpreter '${lib.getExe gawk} -f' + ''; + + doCheck = true; + + # Skipped test: libpsx + # Known issue with no-new-privs disabled in the Nix build environment. + checkPhase = '' + runHook preCheck + meson test --print-errorlogs --no-suite libpsx + runHook postCheck ''; meta = with lib; { From a05b3362454424611b99647a157c32d66007a7f4 Mon Sep 17 00:00:00 2001 From: Muhammad Falak R Wani Date: Thu, 2 May 2024 10:19:52 +0530 Subject: [PATCH 36/36] jujutsu: 0.16.0 -> 0.17.0 Diff: https://github.com/martinvonz/jj/compare/v0.16.0...v0.17.0 Changelog: https://github.com/martinvonz/jj/blob/v0.17.0/CHANGELOG.md Signed-off-by: Muhammad Falak R Wani --- pkgs/applications/version-management/jujutsu/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/jujutsu/default.nix b/pkgs/applications/version-management/jujutsu/default.nix index 8b5580650b32..3ec435d88792 100644 --- a/pkgs/applications/version-management/jujutsu/default.nix +++ b/pkgs/applications/version-management/jujutsu/default.nix @@ -19,16 +19,16 @@ rustPlatform.buildRustPackage rec { pname = "jujutsu"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "martinvonz"; repo = "jj"; rev = "v${version}"; - hash = "sha256-7bMyboF1JG/roFgo3cusYTi7qd2a6W+u1RJHgoBXNL0="; + hash = "sha256-9Otm4EtBhSPix/perfhxHkgVhN0i/2+3JV50ex7xAlY="; }; - cargoHash = "sha256-nPBHIUBm4bQLuj93kE8CUfzA34uUyapVjswz9FFCiTk="; + cargoHash = "sha256-snaqfiTfSKWnjCCUwptAJAl+n2CBRdBSswPR/y555k0="; cargoBuildFlags = [ "--bin" "jj" ]; # don't install the fake editors useNextest = false; # nextest is the upstream integration framework, but is problematic for test skipping