diff --git a/nixos/doc/manual/configuration/abstractions.section.md b/nixos/doc/manual/configuration/abstractions.section.md index 06356c472ba9..3ff8ac885b65 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; }; }; } diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json index d0fbc4f33836..a34d36dab03f 100644 --- a/pkgs/applications/emulators/retroarch/hashes.json +++ b/pkgs/applications/emulators/retroarch/hashes.json @@ -55,20 +55,20 @@ "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", "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", @@ -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", 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 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; 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 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 ]; 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 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="; diff --git a/pkgs/by-name/du/dunst/package.nix b/pkgs/by-name/du/dunst/package.nix index f89bcd196ab3..f01f65c86283 100644 --- a/pkgs/by-name/du/dunst/package.nix +++ b/pkgs/by-name/du/dunst/package.nix @@ -1,28 +1,69 @@ -{ 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 +{ 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: { 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 ]; + 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 +74,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 \ @@ -42,10 +85,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; }; @@ -56,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"; }; }) diff --git a/pkgs/by-name/ew/eww/package.nix b/pkgs/by-name/ew/eww/package.nix index e60ad71ae9c2..76cd0eb46fab 100644 --- a/pkgs/by-name/ew/eww/package.nix +++ b/pkgs/by-name/ew/eww/package.nix @@ -12,18 +12,24 @@ 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 ]; + nativeBuildInputs = [ + pkg-config + wrapGAppsHook3 + ]; buildInputs = [ gtk3 @@ -32,7 +38,10 @@ rustPlatform.buildRustPackage rec { librsvg ]; - cargoBuildFlags = [ "--bin" "eww" ]; + cargoBuildFlags = [ + "--bin" + "eww" + ]; cargoTestFlags = cargoBuildFlags; @@ -40,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; }; 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 = [ 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 ]; + }; +} 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 \ 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"; 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 = [ 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"; + }; +} 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; }; 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; { 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" ]; 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 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 ]; 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 ]; 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 = '' 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" 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 = '' 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; 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}" ]; 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 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" 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