From 96cfe578446b6e32ba565a104d9c6b8f4be62678 Mon Sep 17 00:00:00 2001 From: John Rodewald Date: Sun, 26 Nov 2023 14:21:35 +0100 Subject: [PATCH 01/89] codeberg-pages: 4.6.2 -> 5.0 --- .../continuous-integration/codeberg-pages/default.nix | 8 ++++---- .../codeberg-pages/disable_httptest.patch | 9 ++++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix index d252266f2377..c9ec0cc84ad4 100644 --- a/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix +++ b/pkgs/development/tools/continuous-integration/codeberg-pages/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "codeberg-pages"; - version = "4.6.2"; + version = "5.0"; src = fetchFromGitea { domain = "codeberg.org"; owner = "Codeberg"; repo = "pages-server"; - rev = "ce241fa40adee2b12f8e225db98e09a45bc2acbb"; - sha256 = "sha256-mL2Xs7eyldoZK4zrX6WFlFtwdLN0iVyl1Qh8X6b2u9c="; + rev = "ea68a82cd22a8a8c1f265260af22b9406f13e3a9"; + hash = "sha256-TSXRB0oq1CtHC9ooO+Y3ICS5YE+q+ivZAcYBSd1oWi0="; }; - vendorHash = "sha256-R/LuZkA2xHmu7SO3BVyK1C6n9U+pYn50kNkyLltn2ng="; + vendorHash = "sha256-vTYB3ka34VooN2Wh/Rcj+2S1qAsA2a/VtXlILn1W7oU="; patches = [ ./disable_httptest.patch ]; diff --git a/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch b/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch index 2095b603badc..90c815712d38 100644 --- a/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch +++ b/pkgs/development/tools/continuous-integration/codeberg-pages/disable_httptest.patch @@ -1,12 +1,13 @@ diff --git a/server/handler/handler_test.go b/server/handler/handler_test.go deleted file mode 100644 -index 626564a..0000000 +index 6521633..0000000 --- a/server/handler/handler_test.go +++ /dev/null -@@ -1,49 +0,0 @@ +@@ -1,52 +0,0 @@ -package handler - -import ( +- "net/http" - "net/http/httptest" - "testing" - "time" @@ -24,13 +25,15 @@ index 626564a..0000000 - "https://docs.codeberg.org/pages/raw-content/", - []string{"/.well-known/acme-challenge/"}, - []string{"raw.codeberg.org", "fonts.codeberg.org", "design.codeberg.org"}, +- []string{"pages"}, +- cache.NewKeyValueCache(), - cache.NewKeyValueCache(), - cache.NewKeyValueCache(), - ) - - testCase := func(uri string, status int) { - t.Run(uri, func(t *testing.T) { -- req := httptest.NewRequest("GET", uri, nil) +- req := httptest.NewRequest("GET", uri, http.NoBody) - w := httptest.NewRecorder() - - log.Printf("Start: %v\n", time.Now()) From 3b505b3ed049d1b013a17585d342cbf3bb37769a Mon Sep 17 00:00:00 2001 From: Mikael Fangel <34864484+MikaelFangel@users.noreply.github.com> Date: Tue, 16 Jan 2024 21:25:23 +0100 Subject: [PATCH 02/89] albert: change license to unfree Co-authored-by: Samuel Dionne-Riel --- pkgs/applications/misc/albert/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/albert/default.nix b/pkgs/applications/misc/albert/default.nix index 4bfeaea7d36a..1a9a112b93ef 100644 --- a/pkgs/applications/misc/albert/default.nix +++ b/pkgs/applications/misc/albert/default.nix @@ -73,7 +73,8 @@ stdenv.mkDerivation (finalAttrs: { ''; homepage = "https://albertlauncher.github.io"; changelog = "https://github.com/albertlauncher/albert/blob/${finalAttrs.src.rev}/CHANGELOG.md"; - license = licenses.gpl3Plus; + # See: https://github.com/NixOS/nixpkgs/issues/279226 + license = licenses.unfree; maintainers = with maintainers; [ ericsagnes synthetica ]; mainProgram = "albert"; platforms = platforms.linux; From f68f8fe4a042b16c2b1bce49ad46a8eeac83716b Mon Sep 17 00:00:00 2001 From: Benedikt Tissot Date: Thu, 8 Feb 2024 15:46:54 +0100 Subject: [PATCH 03/89] vaults: init at 0.7.1 --- pkgs/by-name/va/vaults/package.nix | 85 ++++++++++++++++++++++++++++++ 1 file changed, 85 insertions(+) create mode 100644 pkgs/by-name/va/vaults/package.nix diff --git a/pkgs/by-name/va/vaults/package.nix b/pkgs/by-name/va/vaults/package.nix new file mode 100644 index 000000000000..e44c3b73efec --- /dev/null +++ b/pkgs/by-name/va/vaults/package.nix @@ -0,0 +1,85 @@ +{ fetchFromGitHub +, lib +, stdenv +, appstream-glib +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, rustPlatform +, rustc +, cargo +, wrapGAppsHook +, glib +, gtk4 +, libadwaita +, wayland +, gocryptfs +, cryfs +, cmake +}: + +stdenv.mkDerivation rec { + pname = "vaults"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "mpobaschnig"; + repo = "Vaults"; + rev = version; + hash = "sha256-jA7OeyRqc5DxkS4sMx9cIbVlZwd++aCQi09uBQik1oA="; + }; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + name = "${pname}-${version}"; + hash = "sha256-l9Zer6d6kgjIUNiQ1VdQQ57caVNWfzCkdsMf79X8Ar4="; + }; + + postPatch = '' + patchShebangs build-aux + ''; + + makeFlags = [ + "PREFIX=${placeholder "out"}" + ]; + + preFixup = '' + gappsWrapperArgs+=( + --prefix PATH : "${lib.makeBinPath [ gocryptfs cryfs ]}" + ) + ''; + + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + wrapGAppsHook + cargo + rustc + rustPlatform.cargoSetupHook + ]; + + buildInputs = [ + appstream-glib + gtk4 + python3 + glib + libadwaita + wayland + gocryptfs + cryfs + ]; + + meta = { + description = "GTK frontend for encrypted vaults supporting gocryptfs and CryFS for encryption"; + homepage = "https://mpobaschnig.github.io/vaults/"; + changelog = "https://github.com/mpobaschnig/vaults/releases/tag/${version}"; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ benneti ]; + mainProgram = "vaults"; + platforms = lib.platforms.linux; + }; +} From a77bfd0f1528be2e885e4c4c8d41e70dfa6bae0d Mon Sep 17 00:00:00 2001 From: Sylvain Fankhauser Date: Tue, 13 Feb 2024 17:54:48 +0100 Subject: [PATCH 04/89] nixos-rebuild: fix --specialisation with remote builder and target Fixes #286066. --- pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh index 2051368a49f6..3ac165f95c75 100755 --- a/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh +++ b/pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh @@ -791,7 +791,13 @@ if [[ "$action" = switch || "$action" = boot || "$action" = test || "$action" = else cmd+=("$pathToConfig/specialisation/$specialisation/bin/switch-to-configuration") - if [[ ! -f "${cmd[-1]}" ]]; then + if [ -z "$targetHost" ]; then + specialisationExists=$(test -f "${cmd[-1]}") + else + specialisationExists=$(targetHostCmd test -f "${cmd[-1]}") + fi + + if ! $specialisationExists; then log "error: specialisation not found: $specialisation" exit 1 fi From a5c2fa9641a00c9c214c5c044337e76864ed49b4 Mon Sep 17 00:00:00 2001 From: Thane Gill Date: Mon, 19 Feb 2024 10:23:28 -0800 Subject: [PATCH 05/89] ovftool: init at 4.6.2 for x86_64-darwin --- pkgs/tools/virtualization/ovftool/default.nix | 331 ++++++++++++------ 1 file changed, 224 insertions(+), 107 deletions(-) diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index 9bdf4429ff16..76df36a1288a 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -1,150 +1,267 @@ -{ lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {} -, autoPatchelfHook, makeWrapper, unzip -, glibc, c-ares, libxcrypt-legacy, expat, icu60, xercesc, zlib +{ autoPatchelfHook +, c-ares +, darwin +, expat +, fetchurl +, glibc +, icu60 +, lib +, libiconv +, libredirect +, libxcrypt-legacy +, libxml2 +, makeWrapper +, stdenv +, unzip +, xercesc +, zlib }: let - version = "4.6.2-22220919"; - version_i686 = "4.6.0-21452615"; - ovftoolZipUnpackPhase = '' - runHook preUnpack - unzip ${ovftoolSource} - extracted=ovftool/ - if [ -d "$extracted" ]; then - echo "ovftool extracted successfully" >&2 - else - echo "Could not find $extracted - are you sure this is ovftool?" >&2 - exit 1 - fi - runHook postUnpack - ''; + ovftoolSystems = + let + baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public"; + in + { + "i686-linux" = rec { + name = "VMware-ovftool-${version}-lin.i386.zip"; + # As of 2024-02-20 the "Zip of OVF Tool for 32-bit Linux" download link + # on the v4.6.2 page links to v4.6.0. + version = "4.6.0-21452615"; + url = "${baseUrl}/7254abb2-434d-4f5d-83e2-9311ced9752e/57e666a2-874c-48fe-b1d2-4b6381f7fe97/${name}"; + hash = "sha256-qEOr/3SW643G5ZQQNJTelZbUxB8HmxPd5uD+Gqsoxz0="; + }; + "x86_64-linux" = rec { + name = "VMware-ovftool-${version}-lin.x86_64.zip"; + version = "4.6.2-22220919"; + url = "${baseUrl}/8a93ce23-4f88-4ae8-b067-ae174291e98f/c609234d-59f2-4758-a113-0ec5bbe4b120/${name}"; + hash = "sha256-3B1cUDldoTqLsbSARj2abM65nv+Ot0z/Fa35/klJXEY="; + }; + "x86_64-darwin" = rec { + name = "VMware-ovftool-${version}-mac.x64.zip"; + version = "4.6.2-22220919"; + url = "${baseUrl}/91091b23-280a-487a-a048-0c2594303c92/dc666e23-104f-4b9b-be11-6d88dcf3ab98/${name}"; + hash = "sha256-AZufZ0wxt5DYjnpahDfy36W8i7kjIfEkW6MoELSx11k="; + }; + }; - ovftoolSystems = let - baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public"; - in { - "i686-linux" = rec { - name = "VMware-ovftool-${version_i686}-lin.i386.zip"; - url = "${baseUrl}/7254abb2-434d-4f5d-83e2-9311ced9752e/57e666a2-874c-48fe-b1d2-4b6381f7fe97/${name}"; - hash = "sha256-qEOr/3SW643G5ZQQNJTelZbUxB8HmxPd5uD+Gqsoxz0="; - unpackPhase = ovftoolZipUnpackPhase; - }; - "x86_64-linux" = rec { - name = "VMware-ovftool-${version}-lin.x86_64.zip"; - url = "${baseUrl}/8a93ce23-4f88-4ae8-b067-ae174291e98f/c609234d-59f2-4758-a113-0ec5bbe4b120/${name}"; - hash = "sha256-3B1cUDldoTqLsbSARj2abM65nv+Ot0z/Fa35/klJXEY="; - unpackPhase = ovftoolZipUnpackPhase; - }; + ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); + +in +stdenv.mkDerivation { + pname = "ovftool"; + inherit (ovftoolSystem) version; + + src = fetchurl { + inherit (ovftoolSystem) name url hash; }; - ovftoolSystem = if builtins.hasAttr system ovftoolSystems then - ovftoolSystems.${system} - else throw "System '${system}' is unsupported by ovftool"; - - ovftoolSource = if builtins.hasAttr system ovftoolBundles then - ovftoolBundles.${system} - else - fetchurl { - inherit (ovftoolSystem) name url hash; - }; -in -stdenv.mkDerivation rec { - pname = "ovftool"; - inherit version; - - src = ovftoolSource; - buildInputs = [ - glibc - libxcrypt-legacy c-ares expat icu60 + libiconv + libxcrypt-legacy xercesc zlib + ] ++ lib.optionals stdenv.isLinux [ + glibc + ] ++ lib.optionals stdenv.isDarwin [ + darwin.Libsystem + libxml2 ]; - nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; + nativeBuildInputs = [ unzip makeWrapper ] + ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; - preferLocalBuild = true; + postUnpack = '' + # The linux package wraps ofvtool.bin with ovftool. Wrapping + # below in installPhase. + # Rename to ovftool on install for all systems to ovftool + if [[ -f ovftool.bin ]]; then + mv -v ovftool.bin ovftool + fi + ''; - sourceRoot = "."; - - unpackPhase = ovftoolSystem.unpackPhase; - - # Expects a directory named 'ovftool' containing the ovftool install. - # Based on https://aur.archlinux.org/packages/vmware-ovftool/ - # with the addition of a libexec directory and a Nix-style binary wrapper. installPhase = '' runHook preInstall - if [ -d ovftool ]; then - # Ensure we're in the staging directory - cd ovftool - fi - # libraries - install -m 755 -d "$out/lib/${pname}" - # These all appear to be VMWare proprietary except for libgoogleurl and libcurl. - # The rest of the libraries that the installer extracts are omitted here, - # and provided in buildInputs. Since libcurl depends on VMWare's OpenSSL, - # we have to use both here too. - # - # FIXME: can we replace libgoogleurl? Possibly from Chromium? - # FIXME: tell VMware to use a modern version of OpenSSL. - # - install -m 644 -t "$out/lib/${pname}" \ + + # Based on https://aur.archlinux.org/packages/vmware-ovftool/ + # with the addition of a libexec directory and a Nix-style binary wrapper. + + # Almost all libs in the package appear to be VMware proprietary except for + # libgoogleurl and libcurl. The rest of the libraries that the installer + # extracts are omitted here, and provided in buildInputs. Since libcurl + # depends on VMware's OpenSSL, both libs are still used. + # FIXME: Replace libgoogleurl? Possibly from Chromium? + # FIXME: Tell VMware to use a modern version of OpenSSL. As of ovftool + # v4.6.2 ovftool uses openssl-1.0.2zh which in seems to be the extended + # support LTS release: https://www.openssl.org/support/contracts.html + + # Install all libs that are not patched in preFixup. + # Darwin dylibs are under `lib` in the zip. + install -m 755 -d "$out/lib" + install -m 644 -t "$out/lib" \ + '' + lib.optionalString stdenv.isLinux '' + libcrypto.so.1.0.2 \ + libcurl.so.4 \ libgoogleurl.so.59 \ + libssl.so.1.0.2 \ libssoclient.so \ - libvim-types.so libvmacore.so libvmomi.so \ - libcurl.so.4 libcrypto.so.1.0.2 libssl.so.1.0.2 - # libexec binaries - install -m 755 -d "$out/libexec/${pname}" - install -m 755 -t "$out/libexec/${pname}" ovftool.bin - install -m 644 -t "$out/libexec/${pname}" icudt44l.dat - # libexec resources + libvim-types.so \ + libvmacore.so \ + libvmomi.so + '' + lib.optionalString stdenv.isDarwin '' + lib/libcrypto.1.0.2.dylib \ + lib/libcurl.4.dylib \ + lib/libgoogleurl.59.0.30.45.2.dylib \ + lib/libssl.1.0.2.dylib \ + lib/libssoclient.dylib \ + lib/libvim-types.dylib \ + lib/libvmacore.dylib \ + lib/libvmomi.dylib + '' + '' + # Install libexec binaries + # ovftool expects to be run relative to certain directories, namely `env`. + # Place the binary and those dirs in libexec. + install -m 755 -d "$out/libexec" + install -m 755 -t "$out/libexec" ovftool + install -m 644 -t "$out/libexec" icudt44l.dat + + # Install other libexec resources that need to be relative to the `ovftool` + # binary. for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do - install -m 755 -d "$out/libexec/${pname}/$subdir" - install -m 644 -t "$out/libexec/${pname}/$subdir" "$subdir"/*.* + install -m 755 -d "$out/libexec/$subdir" + install -m 644 -t "$out/libexec/$subdir" "$subdir"/*.* done - # EULA/OSS files - install -m 755 -d "$out/share/licenses/${pname}" - install -m 644 -t "$out/share/licenses/${pname}" \ - "vmware.eula" "vmware-eula.rtf" "open_source_licenses.txt" - # documentation files - install -m 755 -d "$out/share/doc/${pname}" - install -m 644 -t "$out/share/doc/${pname}" "README.txt" - # binary wrapper; note that LC_CTYPE is defaulted to en_US.UTF-8 by - # VMWare's wrapper script. We use C.UTF-8 instead. + + # Install EULA/OSS files + install -m 755 -d "$out/share/licenses" + install -m 644 -t "$out/share/licenses" \ + "vmware.eula" \ + "vmware-eula.rtf" \ + "open_source_licenses.txt" + + # Install Docs + install -m 755 -d "$out/share/doc" + install -m 644 -t "$out/share/doc" "README.txt" + + # Install final executable install -m 755 -d "$out/bin" - makeWrapper "$out/libexec/${pname}/ovftool.bin" "$out/bin/ovftool" \ - --set-default LC_CTYPE C.UTF-8 \ + makeWrapper "$out/libexec/ovftool" "$out/bin/ovftool" \ + '' + lib.optionalString stdenv.isLinux '' --prefix LD_LIBRARY_PATH : "$out/lib" + '' + lib.optionalString stdenv.isDarwin '' + --prefix DYLD_LIBRARY_PATH : "$out/lib" + '' + '' runHook postInstall ''; - preFixup = '' + preFixup = lib.optionalString stdenv.isLinux '' addAutoPatchelfSearchPath "$out/lib" + '' + lib.optionalString stdenv.isDarwin '' + change_args=() + + # Change relative @loader_path dylibs to absolute paths. + for lib in $out/lib/*.dylib; do + libname=$(basename $lib) + change_args+=(-change "@loader_path/lib/$libname" "$out/lib/$libname") + done + + # Patches for ovftool binary + change_args+=(-change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib) + change_args+=(-change /usr/lib/libc++.1.dylib ${stdenv.cc.libcxx.cxxabi}/lib/libc++.1.dylib) + change_args+=(-change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib) + change_args+=(-change /usr/lib/libxml2.2.dylib ${libxml2}/lib/libxml2.2.dylib) + change_args+=(-change /usr/lib/libz.1.dylib ${zlib}/lib/libz.1.dylib) + change_args+=(-change @loader_path/lib/libcares.2.dylib ${c-ares}/lib/libcares.2.dylib) + change_args+=(-change @loader_path/lib/libexpat.dylib ${expat}/lib/libexpat.dylib) + change_args+=(-change @loader_path/lib/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) + change_args+=(-change @loader_path/lib/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) + change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) + + # Patch binary + install_name_tool "''${change_args[@]}" "$out/libexec/ovftool" + + # Additional patches for ovftool dylibs + change_args+=(-change /usr/lib/libresolv.9.dylib ${darwin.Libsystem}/lib/libresolv.9.dylib) + change_args+=(-change @loader_path/libcares.2.dylib ${c-ares}/lib/libcares.2.dylib) + change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib) + change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) + change_args+=(-change @loader_path/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) + change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) + + # Add new abolute paths for other libs to all libs + for lib in $out/lib/*.dylib; do + libname=$(basename $lib) + change_args+=(-change "@loader_path/$libname" "$out/lib/$libname") + done + + # Patch all libs + for lib in $out/lib/*.dylib; do + libname=$(basename $lib) + install_name_tool -id "$libname" "$lib" + install_name_tool "''${change_args[@]}" "$lib" + done + ''; + + # These paths are need for install check tests + propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' + (allow file-read* (subpath "/usr/share/locale")) + (allow file-read* (subpath "/var/db/timezone")) + (allow file-read* (subpath "/System/Library/TextEncodings")) ''; doInstallCheck = true; - installCheckPhase = '' - # This is a NixOS 22.11 image (doesn't actually matter) with a 1 MiB root disk that's all zero. - # Make sure that it converts properly. - mkdir -p ovftool-check - cd ovftool-check + postInstallCheck = lib.optionalString stdenv.isDarwin '' + export HOME=$TMPDIR + # Construct a dummy /etc/passwd file - ovftool attempts to determine the + # user's "real" home using this + DUMMY_PASSWD="$(realpath $HOME/dummy-passwd)" + cat > $DUMMY_PASSWD < Date: Sun, 17 Mar 2024 10:11:41 -0400 Subject: [PATCH 06/89] beets-unstable: unstable-2024-10-26 -> unstable-2024-03-16 --- pkgs/tools/audio/beets/builtin-plugins.nix | 3 +++ pkgs/tools/audio/beets/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/beets/builtin-plugins.nix b/pkgs/tools/audio/beets/builtin-plugins.nix index c6ae24dc6906..6b89f74795a8 100644 --- a/pkgs/tools/audio/beets/builtin-plugins.nix +++ b/pkgs/tools/audio/beets/builtin-plugins.nix @@ -136,4 +136,7 @@ autobpm = { testPaths = [ ]; }; + listenbrainz = { + testPaths = [ ]; + }; } diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 7631d106654d..513470b0ffd1 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -85,12 +85,12 @@ in lib.makeExtensible (self: { beets-unstable = callPackage ./common.nix { inherit python3Packages; - version = "unstable-2023-10-26"; + version = "unstable-2024-03-16"; src = fetchFromGitHub { owner = "beetbox"; repo = "beets"; - rev = "6655760732100f5387fad2d2890c015ee5039981"; - hash = "sha256-Nz9BHtacYpJMLmB3f9WFg6GvMa+BuUhiNbJ9cyannek="; + rev = "b09806e0df8f01b9155017d3693764ae7beedcd5"; + hash = "sha256-jE6nZLOEFufqclT6p1zK7dW+vt69q2ulaRsUldL7cSQ="; }; extraPatches = [ # Bash completion fix for Nix From 53136b68e20422b6c77b568f72f37a312de59377 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 10 Jul 2023 17:13:15 +0200 Subject: [PATCH 07/89] gruppled-cursors: init at 1.0.0 --- pkgs/data/icons/gruppled-cursors/default.nix | 30 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/data/icons/gruppled-cursors/default.nix diff --git a/pkgs/data/icons/gruppled-cursors/default.nix b/pkgs/data/icons/gruppled-cursors/default.nix new file mode 100644 index 000000000000..f78becfd615f --- /dev/null +++ b/pkgs/data/icons/gruppled-cursors/default.nix @@ -0,0 +1,30 @@ +{ + stdenvNoCC, + fetchFromGitHub, + theme, + lib, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gruppled-cursors"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nim65s"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-ejlgdogjIYevZvB23si6bEeU6qY7rWXflaUyVk5MzqU="; + }; + + installPhase = '' + mkdir -p $out/share/icons/${theme} + cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme} + ''; + + meta = with lib; { + description = "Gruppled Cursors theme"; + homepage = "https://github.com/nim65s/gruppled-cursors"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ nim65s ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3f54c04f7ea..56f00c62125b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28992,6 +28992,10 @@ with pkgs; spacx-gtk-theme = callPackage ../data/themes/gtk-theme-framework { theme = "spacx"; }; + gruppled-black-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_black"; }; + + gruppled-white-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_white"; }; + gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { inherit (plasma5Packages) breeze-icons; }; From 60d5e3df4e828df6c79bef8fa4ae59a08593c159 Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Mon, 10 Jul 2023 17:47:02 +0200 Subject: [PATCH 08/89] gruppled-lite-cursors: init at 1.0.0 --- .../icons/gruppled-lite-cursors/default.nix | 30 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/data/icons/gruppled-lite-cursors/default.nix diff --git a/pkgs/data/icons/gruppled-lite-cursors/default.nix b/pkgs/data/icons/gruppled-lite-cursors/default.nix new file mode 100644 index 000000000000..eba7daeb0d80 --- /dev/null +++ b/pkgs/data/icons/gruppled-lite-cursors/default.nix @@ -0,0 +1,30 @@ +{ + stdenvNoCC, + fetchFromGitHub, + theme, + lib, +}: + +stdenvNoCC.mkDerivation (finalAttrs: { + pname = "gruppled-lite-cursors"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "nim65s"; + repo = finalAttrs.pname; + rev = "v${finalAttrs.version}"; + hash = "sha256-adCXYu8v6mFKXubVQb/RCZXS87//YgixQp20kMt7KT8="; + }; + + installPhase = '' + mkdir -p $out/share/icons/${theme} + cp -r ${theme}/{cursors,index.theme} $out/share/icons/${theme} + ''; + + meta = with lib; { + description = "Gruppled Lite Cursors theme"; + homepage = "https://github.com/nim65s/gruppled-lite-cursors"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ nim65s ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56f00c62125b..9000c3c8d482 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28994,8 +28994,12 @@ with pkgs; gruppled-black-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_black"; }; + gruppled-black-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors { theme = "gruppled_black_lite"; }; + gruppled-white-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_white"; }; + gruppled-white-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors { theme = "gruppled_white_lite"; }; + gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { inherit (plasma5Packages) breeze-icons; }; From de8b24678debb4014f7fcc86e591fead60eeae3d Mon Sep 17 00:00:00 2001 From: Guilhem Saurel Date: Wed, 20 Mar 2024 10:16:15 +0100 Subject: [PATCH 09/89] gruppled-cursors: follow RFC140 --- pkgs/top-level/all-packages.nix | 23 ++++++++++++++++------- 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9000c3c8d482..190f3595053a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28992,13 +28992,22 @@ with pkgs; spacx-gtk-theme = callPackage ../data/themes/gtk-theme-framework { theme = "spacx"; }; - gruppled-black-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_black"; }; - - gruppled-black-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors { theme = "gruppled_black_lite"; }; - - gruppled-white-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_white"; }; - - gruppled-white-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors { theme = "gruppled_white_lite"; }; + inherit + ({ + gruppled-black-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_black"; }; + gruppled-black-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors { + theme = "gruppled_black_lite"; + }; + gruppled-white-cursors = callPackage ../data/icons/gruppled-cursors { theme = "gruppled_white"; }; + gruppled-white-lite-cursors = callPackage ../data/icons/gruppled-lite-cursors { + theme = "gruppled_white_lite"; + }; + }) + gruppled-black-cursors + gruppled-black-lite-cursors + gruppled-white-cursors + gruppled-white-lite-cursors + ; gruvbox-dark-icons-gtk = callPackage ../data/icons/gruvbox-dark-icons-gtk { inherit (plasma5Packages) breeze-icons; From f3fa245f2391fbb68e1a821c8d5c06abb13be111 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 22 Mar 2024 21:17:25 +0100 Subject: [PATCH 10/89] python3Packages.maestral: 1.8.0 -> 1.9.0 --- .../development/python-modules/maestral/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 92c8dee9b0be..651b9115966c 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -23,12 +23,11 @@ , watchdog , pytestCheckHook , nixosTests -, pythonRelaxDepsHook }: buildPythonPackage rec { pname = "maestral"; - version = "1.8.0"; + version = "1.9.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -37,7 +36,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-YYbdd0GLVKE7+Oi0mpQjqhFdjdlquk/XnIg5WrtKcfI="; + hash = "sha256-xaopoB4lByFkEQY2CZoqJUCnrtFFrnL7Pgn53sSid60="; }; propagatedBuildInputs = [ @@ -68,14 +67,6 @@ buildPythonPackage rec { nativeCheckInputs = [ pytestCheckHook - pythonRelaxDepsHook - ]; - - pythonRelaxDeps = [ - # https://github.com/samschott/maestral/commit/2c50d2ddb49a845ea97bd6b0f68c45d723fb304c - # Allow the use of survey >= 5 - # Remove after new maestral release along with pythonRelaxDepsHook - "survey" ]; preCheck = '' From e9ea01eb6d7c1ab8ff6bc3fb92828fb6e491696d Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 22 Mar 2024 21:19:06 +0100 Subject: [PATCH 11/89] maestral-qt: 1.8.0 -> 1.9.0 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 51fde794a1c8..84be27e1d2ad 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.8.0"; + version = "1.9.0"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-Ys7XrvV4qzq4Q9llua2WgU013Ui0+x+uMwLNIv6xxCw="; + hash = "sha256-QKhntTBX3u/fkJRWSHoyZgjFrLFDkLv6CLB5W5nHzj0="; }; format = "pyproject"; From 660b0a6831d85f6deab139811627dbd2db7ecb61 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 22 Mar 2024 22:02:59 +0100 Subject: [PATCH 12/89] python3Packages.maestral: 1.9.0 -> 1.9.1 --- pkgs/development/python-modules/maestral/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index 651b9115966c..a2da10b858e6 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "maestral"; - version = "1.9.0"; + version = "1.9.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +36,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-xaopoB4lByFkEQY2CZoqJUCnrtFFrnL7Pgn53sSid60="; + hash = "sha256-ilaKcYVZr0rkExna8WLcO+zLUp24eRRfL5SW+sMCJG0="; }; propagatedBuildInputs = [ From 790526d28445159e6cc8adcde7736722557afcf7 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Fri, 22 Mar 2024 22:03:16 +0100 Subject: [PATCH 13/89] maestral-qt: 1.9.0 -> 1.9.1 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 84be27e1d2ad..2649f8e76637 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.9.0"; + version = "1.9.1"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-QKhntTBX3u/fkJRWSHoyZgjFrLFDkLv6CLB5W5nHzj0="; + hash = "sha256-l6LdvJRL8zUdR4xHETCe+a6IPrLl5MXMBBLe83Ivyz8="; }; format = "pyproject"; From b71bc311296cf47bce29823e6e30a771f154b873 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 26 Mar 2024 08:41:30 +0100 Subject: [PATCH 14/89] python3Packages.maestral: 1.9.1 -> 1.9.2 --- pkgs/development/python-modules/maestral/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/maestral/default.nix b/pkgs/development/python-modules/maestral/default.nix index a2da10b858e6..4a733bb60a6f 100644 --- a/pkgs/development/python-modules/maestral/default.nix +++ b/pkgs/development/python-modules/maestral/default.nix @@ -21,13 +21,14 @@ , survey , typing-extensions , watchdog +, xattr , pytestCheckHook , nixosTests }: buildPythonPackage rec { pname = "maestral"; - version = "1.9.1"; + version = "1.9.2"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -36,7 +37,7 @@ buildPythonPackage rec { owner = "SamSchott"; repo = "maestral"; rev = "refs/tags/v${version}"; - hash = "sha256-ilaKcYVZr0rkExna8WLcO+zLUp24eRRfL5SW+sMCJG0="; + hash = "sha256-Bb0yE2OKdlZd6ZsTEWOD+hMuV41fZanesY49L+v4BBE="; }; propagatedBuildInputs = [ @@ -57,6 +58,7 @@ buildPythonPackage rec { survey typing-extensions watchdog + xattr ]; makeWrapperArgs = [ @@ -86,6 +88,8 @@ buildPythonPackage rec { "test_cased_path_candidates" # AssertionError "test_locking_multiprocess" + # OSError: [Errno 95] Operation not supported + "test_move_preserves_xattrs" ]; pythonImportsCheck = [ From a5854398de549cff8d59d27bdc2bb5ea9c25a7f1 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Tue, 26 Mar 2024 08:41:42 +0100 Subject: [PATCH 15/89] maestral-qt: 1.9.1 -> 1.9.2 --- pkgs/applications/networking/maestral-qt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/maestral-qt/default.nix b/pkgs/applications/networking/maestral-qt/default.nix index 2649f8e76637..195fdc855642 100644 --- a/pkgs/applications/networking/maestral-qt/default.nix +++ b/pkgs/applications/networking/maestral-qt/default.nix @@ -10,14 +10,14 @@ python3.pkgs.buildPythonApplication rec { pname = "maestral-qt"; - version = "1.9.1"; + version = "1.9.2"; disabled = python3.pythonOlder "3.7"; src = fetchFromGitHub { owner = "SamSchott"; repo = "maestral-qt"; rev = "refs/tags/v${version}"; - hash = "sha256-l6LdvJRL8zUdR4xHETCe+a6IPrLl5MXMBBLe83Ivyz8="; + hash = "sha256-dgiVSwCTNDncbPJ+f0grjtq822TvtG0PhC9gDOKhwRI="; }; format = "pyproject"; From 72a89d124337d0567d68074dce860824fb41f31c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 29 Mar 2024 17:56:35 -0700 Subject: [PATCH 16/89] borgbackup: 1.2.7 -> 1.2.8 Changelog: https://github.com/borgbackup/borg/blob/1.2.8/docs/changes.rst --- pkgs/tools/backup/borgbackup/default.nix | 32 ++++++++---------------- 1 file changed, 11 insertions(+), 21 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index d7853d0506f6..de4b83b2fb11 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -2,41 +2,31 @@ , stdenv , acl , e2fsprogs +, fetchFromGitHub , libb2 , lz4 , openssh , openssl -, python3Packages +, python3 , xxHash , zstd , installShellFiles , nixosTests -, fetchPypi }: let - python = python3Packages.python.override { - packageOverrides = self: super: { - msgpack = super.msgpack.overrideAttrs (oldAttrs: rec { - version ="1.0.4"; - - src = fetchPypi { - pname = "msgpack"; - inherit version; - hash = "sha256-9dhpwY8DAgLrQS8Iso0q/upVPWYTruieIA16yn7wH18="; - }; - }); - }; - }; + python = python3; in python.pkgs.buildPythonApplication rec { pname = "borgbackup"; - version = "1.2.7"; - format = "pyproject"; + version = "1.2.8"; + pyproject = true; - src = fetchPypi { - inherit pname version; - hash = "sha256-9j8oozg8BBlxzsh7BhyjmoFbX9RF2ySqgXLKxBfZQRo="; + src = fetchFromGitHub { + owner = "borgbackup"; + repo = "borg"; + rev = "refs/tags/${version}"; + hash = "sha256-+FHqOVuHlY9QUjCrYVnrMBZPMFH9Z2U7eZ6eUSINSrw="; }; postPatch = '' @@ -130,7 +120,7 @@ python.pkgs.buildPythonApplication rec { outputs = [ "out" "doc" "man" ]; meta = with lib; { - changelog = "https://github.com/borgbackup/borg/blob/${version}/docs/changes.rst"; + changelog = "https://github.com/borgbackup/borg/blob/${src.rev}/docs/changes.rst"; description = "Deduplicating archiver with compression and encryption"; homepage = "https://www.borgbackup.org"; license = licenses.bsd3; From cc2adde5315640763dd3507f08672d8a8f462c88 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 30 Mar 2024 11:49:14 -0700 Subject: [PATCH 17/89] borgbackup: modernize --- pkgs/tools/backup/borgbackup/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/borgbackup/default.nix b/pkgs/tools/backup/borgbackup/default.nix index de4b83b2fb11..778f5a5aad9f 100644 --- a/pkgs/tools/backup/borgbackup/default.nix +++ b/pkgs/tools/backup/borgbackup/default.nix @@ -32,14 +32,16 @@ python.pkgs.buildPythonApplication rec { postPatch = '' # sandbox does not support setuid/setgid/sticky bits substituteInPlace src/borg/testsuite/archiver.py \ - --replace "0o4755" "0o0755" + --replace-fail "0o4755" "0o0755" ''; - nativeBuildInputs = with python.pkgs; [ + build-system = with python.pkgs; [ cython setuptools-scm pkgconfig + ]; + nativeBuildInputs = with python.pkgs; [ # docs sphinxHook guzzle-sphinx-theme @@ -60,7 +62,7 @@ python.pkgs.buildPythonApplication rec { acl ]; - propagatedBuildInputs = with python.pkgs; [ + dependencies = with python.pkgs; [ msgpack packaging (if stdenv.isLinux then pyfuse3 else llfuse) From dd2c6f1840ff3919e5bbf1943d0f6995c5812bfd Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 30 Mar 2024 20:07:35 -0500 Subject: [PATCH 18/89] nixos/sunshine: init --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + .../modules/services/networking/sunshine.nix | 156 ++++++++++++++++++ nixos/tests/all-tests.nix | 1 + nixos/tests/sunshine.nix | 70 ++++++++ 5 files changed, 230 insertions(+) create mode 100644 nixos/modules/services/networking/sunshine.nix create mode 100644 nixos/tests/sunshine.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index b736d71288c0..dba9d5d95657 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -140,6 +140,8 @@ The pre-existing [services.ankisyncd](#opt-services.ankisyncd.enable) has been m - [Mealie](https://nightly.mealie.io/), a self-hosted recipe manager and meal planner with a RestAPI backend and a reactive frontend application built in NuxtJS for a pleasant user experience for the whole family. Available as [services.mealie](#opt-services.mealie.enable) +- [Sunshine](https://app.lizardbyte.dev/Sunshine), a self-hosted game stream host for Moonlight. Available as [services.sunshine](#opt-services.sunshine.enable). + - [Uni-Sync](https://github.com/EightB1ts/uni-sync), a synchronization tool for Lian Li Uni Controllers. Available as [hardware.uni-sync](#opt-hardware.uni-sync.enable) ## Backward Incompatibilities {#sec-release-24.05-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 0c8e66c33174..37239cb25325 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1145,6 +1145,7 @@ ./services/networking/strongswan.nix ./services/networking/stubby.nix ./services/networking/stunnel.nix + ./services/networking/sunshine.nix ./services/networking/supplicant.nix ./services/networking/supybot.nix ./services/networking/syncplay.nix diff --git a/nixos/modules/services/networking/sunshine.nix b/nixos/modules/services/networking/sunshine.nix new file mode 100644 index 000000000000..c115b9cd5cf9 --- /dev/null +++ b/nixos/modules/services/networking/sunshine.nix @@ -0,0 +1,156 @@ +{ config, lib, pkgs, utils, ... }: +let + inherit (lib) mkEnableOption mkPackageOption mkOption mkIf mkDefault types optionals getExe; + inherit (utils) escapeSystemdExecArgs; + cfg = config.services.sunshine; + + # ports used are offset from a single base port, see https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#port + generatePorts = port: offsets: map (offset: port + offset) offsets; + defaultPort = 47989; + + appsFormat = pkgs.formats.json { }; + settingsFormat = pkgs.formats.keyValue { }; + + appsFile = appsFormat.generate "apps.json" cfg.applications; + configFile = settingsFormat.generate "sunshine.conf" cfg.settings; +in +{ + options.services.sunshine = with types; { + enable = mkEnableOption "Sunshine, a self-hosted game stream host for Moonlight"; + package = mkPackageOption pkgs "sunshine" { }; + openFirewall = mkOption { + type = bool; + default = false; + description = '' + Whether to automatically open ports in the firewall. + ''; + }; + capSysAdmin = mkOption { + type = bool; + default = false; + description = '' + Whether to give the Sunshine binary CAP_SYS_ADMIN, required for DRM/KMS screen capture. + ''; + }; + settings = mkOption { + default = { }; + description = '' + Settings to be rendered into the configuration file. If this is set, no configuration is possible from the web UI. + + See https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#configuration for syntax. + ''; + example = '' + { + sunshine_name = "nixos"; + } + ''; + type = submodule (settings: { + freeformType = settingsFormat.type; + options.port = mkOption { + type = port; + default = defaultPort; + description = '' + Base port -- others used are offset from this one, see https://docs.lizardbyte.dev/projects/sunshine/en/latest/about/advanced_usage.html#port for details. + ''; + }; + }); + }; + applications = mkOption { + default = { }; + description = '' + Configuration for applications to be exposed to Moonlight. If this is set, no configuration is possible from the web UI, and must be by the `settings` option. + ''; + example = '' + { + env = { + PATH = "$(PATH):$(HOME)/.local/bin"; + }; + apps = [ + { + name = "1440p Desktop"; + prep-cmd = [ + { + do = "''${pkgs.kdePackages.libkscreen}/bin/kscreen-doctor output.DP-4.mode.2560x1440@144"; + undo = "''${pkgs.kdePackages.libkscreen}/bin/kscreen-doctor output.DP-4.mode.3440x1440@144"; + } + ]; + exclude-global-prep-cmd = "false"; + auto-detach = "true"; + } + ]; + } + ''; + type = submodule { + options = { + env = mkOption { + default = { }; + description = '' + Environment variables to be set for the applications. + ''; + type = attrsOf str; + }; + apps = mkOption { + default = [ ]; + description = '' + Applications to be exposed to Moonlight. + ''; + type = listOf attrs; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + services.sunshine.settings.file_apps = mkIf (cfg.applications.apps != [ ]) "${appsFile}"; + + environment.systemPackages = [ + cfg.package + ]; + + networking.firewall = mkIf cfg.openFirewall { + allowedTCPPorts = generatePorts cfg.settings.port [ (-5) 0 1 21 ]; + allowedUDPPorts = generatePorts cfg.settings.port [ 9 10 11 13 21 ]; + }; + + boot.kernelModules = [ "uinput" ]; + + services.udev.packages = [ cfg.package ]; + + services.avahi = { + enable = mkDefault true; + publish = { + enable = mkDefault true; + userServices = mkDefault true; + }; + }; + + security.wrappers.sunshine = mkIf cfg.capSysAdmin { + owner = "root"; + group = "root"; + capabilities = "cap_sys_admin+p"; + source = getExe cfg.package; + }; + + systemd.user.services.sunshine = { + description = "Self-hosted game stream host for Moonlight"; + + wantedBy = [ "graphical-session.target" ]; + partOf = [ "graphical-session.target" ]; + wants = [ "graphical-session.target" ]; + after = [ "graphical-session.target" ]; + + startLimitIntervalSec = 500; + startLimitBurst = 5; + + serviceConfig = { + # only add configFile if an application or a setting other than the default port is set to allow configuration from web UI + ExecStart = escapeSystemdExecArgs ([ + (if cfg.capSysAdmin then "${config.security.wrapperDir}/sunshine" else "${getExe cfg.package}") + ] ++ optionals (cfg.applications.apps != [ ] || (builtins.length (builtins.attrNames cfg.settings) > 1 || cfg.settings.port != defaultPort)) [ "${configFile}" ]); + Restart = "on-failure"; + RestartSec = "5s"; + }; + }; + }; +} diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index f7ad6c16f587..f42b5c43af69 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -842,6 +842,7 @@ in { stunnel = handleTest ./stunnel.nix {}; sudo = handleTest ./sudo.nix {}; sudo-rs = handleTest ./sudo-rs.nix {}; + sunshine = handleTest ./sunshine.nix {}; suwayomi-server = handleTest ./suwayomi-server.nix {}; swap-file-btrfs = handleTest ./swap-file-btrfs.nix {}; swap-partition = handleTest ./swap-partition.nix {}; diff --git a/nixos/tests/sunshine.nix b/nixos/tests/sunshine.nix new file mode 100644 index 000000000000..7c7e86de203a --- /dev/null +++ b/nixos/tests/sunshine.nix @@ -0,0 +1,70 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "sunshine"; + meta = { + # test is flaky on aarch64 + broken = pkgs.stdenv.isAarch64; + maintainers = [ lib.maintainers.devusb ]; + }; + + nodes.sunshine = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + services.sunshine = { + enable = true; + openFirewall = true; + settings = { + capture = "x11"; + encoder = "software"; + output_name = 0; + }; + }; + + environment.systemPackages = with pkgs; [ + gxmessage + ]; + + }; + + nodes.moonlight = { config, pkgs, ... }: { + imports = [ + ./common/x11.nix + ]; + + environment.systemPackages = with pkgs; [ + moonlight-qt + ]; + + }; + + enableOCR = true; + + testScript = '' + # start the tests, wait for sunshine to be up + start_all() + sunshine.wait_for_open_port(48010,"localhost") + + # set the admin username/password, restart sunshine + sunshine.execute("sunshine --creds sunshine sunshine") + sunshine.systemctl("restart sunshine","root") + sunshine.wait_for_open_port(48010,"localhost") + + # initiate pairing from moonlight + moonlight.execute("moonlight pair sunshine --pin 1234 >&2 & disown") + moonlight.wait_for_console_text("Executing request") + + # respond to pairing request from sunshine + sunshine.succeed("curl --insecure -u sunshine:sunshine -d '{\"pin\": \"1234\"}' https://localhost:47990/api/pin") + + # close moonlight once pairing complete + moonlight.send_key("kp_enter") + + # put words on the sunshine screen for moonlight to see + sunshine.execute("gxmessage 'hello world' -center -font 'sans 75' >&2 & disown") + + # connect to sunshine from moonlight and look for the words + moonlight.execute("moonlight --video-decoder software stream sunshine 'Desktop' >&2 & disown") + moonlight.wait_for_text("hello world") + ''; +}) From c44ca352868d7c9e8ce5b1b90d7df28a28643be6 Mon Sep 17 00:00:00 2001 From: Morgan Helton Date: Sat, 30 Mar 2024 20:07:48 -0500 Subject: [PATCH 19/89] sunshine: add NixOS test --- pkgs/servers/sunshine/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/sunshine/default.nix b/pkgs/servers/sunshine/default.nix index a401f318a911..6249a61dd376 100644 --- a/pkgs/servers/sunshine/default.nix +++ b/pkgs/servers/sunshine/default.nix @@ -4,6 +4,7 @@ , autoPatchelfHook , makeWrapper , buildNpmPackage +, nixosTests , cmake , avahi , libevdev @@ -181,7 +182,10 @@ stdenv'.mkDerivation rec { install -Dm644 ../packaging/linux/${pname}.desktop $out/share/applications/${pname}.desktop ''; - passthru.updateScript = ./updater.sh; + passthru = { + tests.sunshine = nixosTests.sunshine; + updateScript = ./updater.sh; + }; meta = with lib; { description = "Sunshine is a Game stream host for Moonlight"; From 96da6f53e02e8ac7fc5136461429a742db5550db Mon Sep 17 00:00:00 2001 From: huantian Date: Fri, 29 Mar 2024 22:01:29 -0700 Subject: [PATCH 20/89] tetrio-desktop: use nixpkgs electron --- pkgs/by-name/te/tetrio-desktop/package.nix | 62 ++++++---------------- 1 file changed, 17 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index d7fed29e7dae..274cd2d26957 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -2,19 +2,9 @@ , lib , fetchurl , dpkg -, autoPatchelfHook -, wrapGAppsHook -, alsa-lib -, cups -, libGL -, libX11 -, libXScrnSaver -, libXtst -, mesa -, nss -, gtk3 -, libpulseaudio -, systemd +, makeWrapper +, addOpenGLRunpath +, electron , withTetrioPlus ? false # For backwards compatibility. At the time of writing, the latest released tetrio plus version is not compatible with tetrio desktop. , tetrio-plus ? false # For backwards compatibility. At the time of writing, the latest released tetrio plus version is not compatible with tetrio desktop. }: @@ -22,13 +12,6 @@ lib.warnIf (withTetrioPlus != false) "withTetrioPlus: Currently unsupported with tetrio-desktop 9.0.0. Please remove this attribute." lib.warnIf (tetrio-plus != false) "tetrio-plus: Currently unsupported with tetrio-desktop 9.0.0. Please remove this attribute." -(let - libPath = lib.makeLibraryPath [ - libGL - libpulseaudio - systemd - ]; -in stdenv.mkDerivation (finalAttrs: { pname = "tetrio-desktop"; version = "9.0.0"; @@ -40,31 +23,17 @@ stdenv.mkDerivation (finalAttrs: { nativeBuildInputs = [ dpkg - autoPatchelfHook - wrapGAppsHook + makeWrapper ]; - dontWrapGApps = true; - - buildInputs = [ - alsa-lib - cups - libX11 - libXScrnSaver - libXtst - mesa - nss - gtk3 - ]; - - unpackCmd = "dpkg -x $curSrc src"; - installPhase = '' runHook preInstall - mkdir -p $out/bin - cp -r opt/ usr/share/ $out - ln -s $out/opt/TETR.IO/TETR.IO $out/bin/tetrio + mkdir -p $out + cp -r usr/share/ $out + + mkdir -p $out/share/TETR.IO/ + cp opt/TETR.IO/resources/app.asar $out/share/TETR.IO/app.asar substituteInPlace $out/share/applications/TETR.IO.desktop \ --replace-fail "Exec=/opt/TETR.IO/TETR.IO" "Exec=$out/bin/tetrio" @@ -73,12 +42,14 @@ stdenv.mkDerivation (finalAttrs: { ''; postFixup = '' - wrapProgram $out/opt/TETR.IO/TETR.IO \ - --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/TETR.IO \ - ''${gappsWrapperArgs[@]} + makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \ + --prefix LD_LIBRARY_PATH : ${addOpenGLRunpath.driverLink}/lib \ + --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ + --add-flags $out/share/TETR.IO/app.asar ''; meta = { + changelog = "https://tetr.io/about/desktop/history/"; description = "TETR.IO desktop client"; downloadPage = "https://tetr.io/about/desktop/"; homepage = "https://tetr.io"; @@ -88,7 +59,8 @@ stdenv.mkDerivation (finalAttrs: { Play against friends and foes all over the world, or claim a spot on the leaderboards - the stacker future is yours! ''; mainProgram = "tetrio"; - maintainers = with lib.maintainers; [ wackbyte ]; + maintainers = with lib.maintainers; [ wackbyte huantian ]; platforms = [ "x86_64-linux" ]; + sourceProvenance = [ lib.sourceTypes.binaryBytecode ]; }; -})) +}) From 3e9e7d092f59234b45b1fa42d09f16bbbd7addb9 Mon Sep 17 00:00:00 2001 From: huantian Date: Wed, 3 Apr 2024 00:35:32 -0700 Subject: [PATCH 21/89] tetrio-desktop: re-add tetrio-plus, now from source --- pkgs/by-name/te/tetrio-desktop/package.json | 22 ++ pkgs/by-name/te/tetrio-desktop/package.nix | 48 ++- .../by-name/te/tetrio-desktop/tetrio-plus.nix | 160 ++++++++ pkgs/by-name/te/tetrio-desktop/yarn.lock | 348 ++++++++++++++++++ 4 files changed, 559 insertions(+), 19 deletions(-) create mode 100644 pkgs/by-name/te/tetrio-desktop/package.json create mode 100644 pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix create mode 100644 pkgs/by-name/te/tetrio-desktop/yarn.lock diff --git a/pkgs/by-name/te/tetrio-desktop/package.json b/pkgs/by-name/te/tetrio-desktop/package.json new file mode 100644 index 000000000000..65bf8ea63f76 --- /dev/null +++ b/pkgs/by-name/te/tetrio-desktop/package.json @@ -0,0 +1,22 @@ +{ + "name": "tetrio-desktop", + "version": "9.0.0", + "author": { + "name": "osk", + "email": "me@osk.sh" + }, + "license": "© osk 2019-2024. All Rights Reserved.", + "homepage": "https://tetr.io/", + "main": "main.js", + "description": "Puzzle together in this modern yet familiar online stacker!", + "dependencies": { + "discord-rich-presence": "0.0.8", + "electron-store": "^8.1.0", + "image-size": "^1.1.1", + "node-fetch": "2.6.1", + "openpgp": "^5.11.1", + "systeminformation": "^5.22.0", + "whatwg-url": "^14.0.0", + "xmldom": "^0.6.0" + } +} diff --git a/pkgs/by-name/te/tetrio-desktop/package.nix b/pkgs/by-name/te/tetrio-desktop/package.nix index 274cd2d26957..c3749de57dad 100644 --- a/pkgs/by-name/te/tetrio-desktop/package.nix +++ b/pkgs/by-name/te/tetrio-desktop/package.nix @@ -1,45 +1,55 @@ { stdenv , lib -, fetchurl +, fetchzip , dpkg , makeWrapper +, callPackage , addOpenGLRunpath , electron -, withTetrioPlus ? false # For backwards compatibility. At the time of writing, the latest released tetrio plus version is not compatible with tetrio desktop. -, tetrio-plus ? false # For backwards compatibility. At the time of writing, the latest released tetrio plus version is not compatible with tetrio desktop. +, withTetrioPlus ? true +, tetrio-plus ? null }: -lib.warnIf (withTetrioPlus != false) "withTetrioPlus: Currently unsupported with tetrio-desktop 9.0.0. Please remove this attribute." -lib.warnIf (tetrio-plus != false) "tetrio-plus: Currently unsupported with tetrio-desktop 9.0.0. Please remove this attribute." - stdenv.mkDerivation (finalAttrs: { pname = "tetrio-desktop"; version = "9.0.0"; - src = fetchurl { + src = fetchzip { url = "https://tetr.io/about/desktop/builds/${lib.versions.major finalAttrs.version}/TETR.IO%20Setup.deb"; - hash = "sha256-UriLwMB8D+/T32H4rPbkJAy/F/FFhNpd++0AR1lwEfs="; + hash = "sha256-TgegFy+sHjv0ILaiLO1ghyUhKXoj8v43ACJOJhKyI0c="; + nativeBuildInputs = [ dpkg ]; }; nativeBuildInputs = [ - dpkg makeWrapper ]; - installPhase = '' - runHook preInstall + installPhase = + let + tetrio-plus' = + if tetrio-plus == null + then callPackage ./tetrio-plus.nix { tetrio-src = finalAttrs.src; } + else tetrio-plus; - mkdir -p $out - cp -r usr/share/ $out + asarPath = + if withTetrioPlus + then "${tetrio-plus'}/app.asar" + else "opt/TETR.IO/resources/app.asar"; + in + '' + runHook preInstall - mkdir -p $out/share/TETR.IO/ - cp opt/TETR.IO/resources/app.asar $out/share/TETR.IO/app.asar + mkdir -p $out + cp -r usr/share/ $out - substituteInPlace $out/share/applications/TETR.IO.desktop \ - --replace-fail "Exec=/opt/TETR.IO/TETR.IO" "Exec=$out/bin/tetrio" + mkdir -p $out/share/TETR.IO/ + cp ${asarPath} $out/share/TETR.IO/app.asar - runHook postInstall - ''; + substituteInPlace $out/share/applications/TETR.IO.desktop \ + --replace-fail "Exec=/opt/TETR.IO/TETR.IO" "Exec=$out/bin/tetrio" + + runHook postInstall + ''; postFixup = '' makeShellWrapper '${lib.getExe electron}' $out/bin/tetrio \ diff --git a/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix new file mode 100644 index 000000000000..a0c67265e51c --- /dev/null +++ b/pkgs/by-name/te/tetrio-desktop/tetrio-plus.nix @@ -0,0 +1,160 @@ +{ lib +, stdenv +, fetchFromGitLab +, rustPlatform +, rustc +, wasm-pack +, wasm-bindgen-cli +, binaryen + +, fetchYarnDeps +, yarn +, fixup_yarn_lock +, nodejs +, asar + +, tetrio-src +}: + +let + version = "unstable-2024-03-31"; + + src = fetchFromGitLab { + owner = "UniQMG"; + repo = "tetrio-plus"; + rev = "b13d476a162a2aec4ca0def29eb7a4ada9ebf523"; + hash = "sha256-bZwx0r2lu4Ed/pYRvNog6IIok/HMoK+UeDIQctggUEs="; + fetchSubmodules = true; + + # tetrio-plus uses this info for displaying its version, + # so we need to deep clone to have all the revision history. + # After we're done, we emulate 'leaveDotGit = false' by removing + # all the .git folders. + leaveDotGit = true; + deepClone = true; + postFetch = '' + cd "$out" + git rev-parse --short HEAD~1 > resources/ci-commit-previous + git rev-parse --short HEAD > resources/ci-commit + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; + }; + + wasm-bindgen-82 = wasm-bindgen-cli.override { + version = "0.2.82"; + hash = "sha256-BQ8v3rCLUvyCCdxo5U+NHh30l9Jwvk9Sz8YQv6fa0SU="; + cargoHash = "sha256-mP85+qi2KA0GieaBzbrQOBqYxBZNRJipvd2brCRGyOM="; + }; + + tpsecore = rustPlatform.buildRustPackage { + pname = "tpsecore"; + inherit version src; + + sourceRoot = "${src.name}/tpsecore"; + + cargoHash = "sha256-14UjPSlfiuf696cqy8+fz3SmfmFoGQlEDg9obP0EKXg="; + + nativeBuildInputs = [ + wasm-pack + wasm-bindgen-82 + binaryen + rustc.llvmPackages.lld + ]; + + buildPhase = '' + HOME=$(mktemp -d) RUSTFLAGS="-C linker=lld" wasm-pack build --target web --release + ''; + + installPhase = '' + cp -r pkg/ $out + ''; + + doCheck = false; + + meta = { + description = "A self contained toolkit for creating, editing, and previewing TPSE files"; + homepage = "https://gitlab.com/UniQMG/tpsecore"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ huantian wackbyte ]; + platforms = lib.platforms.linux; + }; + }; + + offlineCache = fetchYarnDeps { + yarnLock = ./yarn.lock; + hash = "sha256-VYUh9y6PRc1OTLELkqCxP89Xbesv3Nu+eUq6fkuoQHE="; + }; + +in +stdenv.mkDerivation (finalAttrs: { + pname = "tetrio-plus"; + inherit version src; + + nativeBuildInputs = [ + yarn + fixup_yarn_lock + nodejs + asar + ]; + + buildPhase = '' + runHook preBuild + + # 'out' is the directory that the tetrio-plus expects the vanilla asar to be + # and this is the directory that will contain the final result that we want + asar extract ${tetrio-src}/opt/TETR.IO/resources/app.asar out + cd out + + # Install custom package.json/yarn.lock that describe the additional node + # dependencies that tetrio-plus needs to run, and install them in our output + install -m644 ${./package.json} package.json + install -m644 ${./yarn.lock} yarn.lock + + export HOME=$(mktemp -d) + yarn config --offline set yarn-offline-mirror ${offlineCache} + fixup_yarn_lock yarn.lock + yarn install --offline --frozen-lockfile --ignore-platform --ignore-scripts --no-progress --non-interactive + patchShebangs node_modules/ + + cd .. + + # The simple build script expects the vanilla asar located here + # This patches the vanilla code to load the tetrio-plus code + ln -s ${tetrio-src}/opt/TETR.IO/resources/app.asar app.asar + node ./scripts/build-electron.js + + # Finally, we install the tetrio-plus code where the above patch script expects + cp -r $src out/tetrioplus + chmod -R u+w out/tetrioplus + + # We don't need the tpsecore source code bundled + rm -rf out/tetrioplus/tpsecore/ + # since we install the compiled version here + cp ${tpsecore}/{tpsecore_bg.wasm,tpsecore.js} out/tetrioplus/source/lib/ + + runHook postBuild + ''; + + installPhase = '' + runHook preinstall + + mkdir -p $out + asar pack out $out/app.asar + + runHook postinstall + ''; + + meta = { + description = "TETR.IO customization tool suite"; + downloadPage = "https://gitlab.com/UniQMG/tetrio-plus/-/releases"; + homepage = "https://gitlab.com/UniQMG/tetrio-plus"; + license = [ + lib.licenses.mit + # while tetrio-plus is itself mit, the result of this derivation + # is a modified version of tetrio-desktop, which is unfree. + lib.licenses.unfree + ]; + maintainers = with lib.maintainers; [ huantian wackbyte ]; + platforms = lib.platforms.linux; + }; +}) diff --git a/pkgs/by-name/te/tetrio-desktop/yarn.lock b/pkgs/by-name/te/tetrio-desktop/yarn.lock new file mode 100644 index 000000000000..9c6cd6519a9f --- /dev/null +++ b/pkgs/by-name/te/tetrio-desktop/yarn.lock @@ -0,0 +1,348 @@ +# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY. +# yarn lockfile v1 + + +ajv-formats@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.1.tgz#6e669400659eb74973bbf2e33327180a0996b520" + integrity sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA== + dependencies: + ajv "^8.0.0" + +ajv@^8.0.0, ajv@^8.6.3: + version "8.12.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.12.0.tgz#d1a0527323e22f53562c567c00991577dfbe19d1" + integrity sha512-sRu1kpcO9yLtYxBKvqfTeh9KzZEwO3STyX1HT+4CaDzC6HpTGYhIhPIzj9XuKU7KYDwnaeh5hcOwjy1QuJzBPA== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +asn1.js@^5.0.0: + version "5.4.1" + resolved "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz#11a980b84ebb91781ce35b0fdc2ee294e3783f07" + integrity sha512-+I//4cYPccV8LdmBLiX8CYvf9Sp3vQsrqu2QNXRcrbiWvcx/UdlFiqUJJzxRQxgsZmvhXhn4cSKeSmoFjVdupA== + dependencies: + bn.js "^4.0.0" + inherits "^2.0.1" + minimalistic-assert "^1.0.0" + safer-buffer "^2.1.0" + +atomically@^1.7.0: + version "1.7.0" + resolved "https://registry.yarnpkg.com/atomically/-/atomically-1.7.0.tgz#c07a0458432ea6dbc9a3506fffa424b48bccaafe" + integrity sha512-Xcz9l0z7y9yQ9rdDaxlmaI4uJHf/T8g9hOEzJcsEqX2SjCj4J20uK7+ldkDHMbpJDK76wF7xEIgxc/vSlsfw5w== + +bindings@^1.3.0: + version "1.5.0" + resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.5.0.tgz#10353c9e945334bc0511a6d90b38fbc7c9c504df" + integrity sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ== + dependencies: + file-uri-to-path "1.0.0" + +bn.js@^4.0.0: + version "4.12.0" + resolved "https://registry.yarnpkg.com/bn.js/-/bn.js-4.12.0.tgz#775b3f278efbb9718eec7361f483fb36fbbfea88" + integrity sha512-c98Bf3tPniI+scsdk237ku1Dc3ujXQTSgyiPUDEOe7tRkhrqridvh8klBv0HCEso1OLOYcHuCv/cS6DNxKH+ZA== + +conf@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/conf/-/conf-10.2.0.tgz#838e757be963f1a2386dfe048a98f8f69f7b55d6" + integrity sha512-8fLl9F04EJqjSqH+QjITQfJF8BrOVaYr1jewVgSRAEWePfxT0sku4w2hrGQ60BC/TNLGQ2pgxNlTbWQmMPFvXg== + dependencies: + ajv "^8.6.3" + ajv-formats "^2.1.1" + atomically "^1.7.0" + debounce-fn "^4.0.0" + dot-prop "^6.0.1" + env-paths "^2.2.1" + json-schema-typed "^7.0.3" + onetime "^5.1.2" + pkg-up "^3.1.0" + semver "^7.3.5" + +debounce-fn@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/debounce-fn/-/debounce-fn-4.0.0.tgz#ed76d206d8a50e60de0dd66d494d82835ffe61c7" + integrity sha512-8pYCQiL9Xdcg0UPSD3d+0KMlOjp+KGU5EPwYddgzQ7DATsg4fuUDjQtsYLmWjnk2obnNHgV3vE2Y4jejSOJVBQ== + dependencies: + mimic-fn "^3.0.0" + +discord-rich-presence@0.0.8: + version "0.0.8" + resolved "https://registry.yarnpkg.com/discord-rich-presence/-/discord-rich-presence-0.0.8.tgz#7a2b41ff87a278e8a2c8835cd91c9890d6b9fbdd" + integrity sha512-IpVMPjv15C9UvppxvrrGdv6bzQHOW1P1vLoMH15HvdJwGJ3dBd2bnrJ63Uy36YRUfrAMxGLiwUDHncvC8AuPaQ== + dependencies: + discord-rpc "github:discordjs/rpc" + +"discord-rpc@github:discordjs/rpc": + version "4.0.1" + resolved "https://codeload.github.com/discordjs/rpc/tar.gz/9e7de2a6d917591f10a66389e62e1dc053c04fec" + dependencies: + node-fetch "^2.6.1" + ws "^7.3.1" + optionalDependencies: + register-scheme "github:devsnek/node-register-scheme" + +dot-prop@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/dot-prop/-/dot-prop-6.0.1.tgz#fc26b3cf142b9e59b74dbd39ed66ce620c681083" + integrity sha512-tE7ztYzXHIeyvc7N+hR3oi7FIbf/NIjVP9hmAt3yMXzrQ072/fpjGLx2GxNxGxUl5V73MEqYzioOMoVhGMJ5cA== + dependencies: + is-obj "^2.0.0" + +electron-store@^8.1.0: + version "8.2.0" + resolved "https://registry.yarnpkg.com/electron-store/-/electron-store-8.2.0.tgz#114e6e453e8bb746ab4ccb542424d8c881ad2ca1" + integrity sha512-ukLL5Bevdil6oieAOXz3CMy+OgaItMiVBg701MNlG6W5RaC0AHN7rvlqTCmeb6O7jP0Qa1KKYTE0xV0xbhF4Hw== + dependencies: + conf "^10.2.0" + type-fest "^2.17.0" + +env-paths@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" + integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A== + +fast-deep-equal@^3.1.1: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +file-uri-to-path@1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd" + integrity sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw== + +find-up@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/find-up/-/find-up-3.0.0.tgz#49169f1d7993430646da61ecc5ae355c21c97b73" + integrity sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg== + dependencies: + locate-path "^3.0.0" + +image-size@^1.1.1: + version "1.1.1" + resolved "https://registry.yarnpkg.com/image-size/-/image-size-1.1.1.tgz#ddd67d4dc340e52ac29ce5f546a09f4e29e840ac" + integrity sha512-541xKlUw6jr/6gGuk92F+mYM5zaFAc5ahphvkqvNe2bQ6gVBkd6bfrmVJ2t4KDAfikAYZyIqTnktX3i6/aQDrQ== + dependencies: + queue "6.0.2" + +inherits@^2.0.1, inherits@~2.0.3: + version "2.0.4" + resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.4.tgz#0fa2c64f932917c3433a0ded55363aae37416b7c" + integrity sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ== + +is-obj@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982" + integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-schema-typed@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/json-schema-typed/-/json-schema-typed-7.0.3.tgz#23ff481b8b4eebcd2ca123b4fa0409e66469a2d9" + integrity sha512-7DE8mpG+/fVw+dTpjbxnx47TaMnDfOI1jwft9g1VybltZCduyRQPJPvc+zzKY9WPHxhPWczyFuYa6I8Mw4iU5A== + +locate-path@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-3.0.0.tgz#dbec3b3ab759758071b58fe59fc41871af21400e" + integrity sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A== + dependencies: + p-locate "^3.0.0" + path-exists "^3.0.0" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + +mimic-fn@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b" + integrity sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg== + +mimic-fn@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-3.1.0.tgz#65755145bbf3e36954b949c16450427451d5ca74" + integrity sha512-Ysbi9uYW9hFyfrThdDEQuykN4Ey6BuwPD2kpI5ES/nFTDn/98yxYNLZJcgUAKPT/mcrLLKaGzJR9YVxJrIdASQ== + +minimalistic-assert@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7" + integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A== + +node-addon-api@^1.3.0: + version "1.7.2" + resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-1.7.2.tgz#3df30b95720b53c24e59948b49532b662444f54d" + integrity sha512-ibPK3iA+vaY1eEjESkQkM0BbCqFOaZMiXRTtdB0u7b4djtY6JnsjvPdUHVMg6xQt3B8fpTTWHI9A+ADjM9frzg== + +node-fetch@2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + +node-fetch@^2.6.1: + version "2.7.0" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.7.0.tgz#d0f0fa6e3e2dc1d27efcd8ad99d550bda94d187d" + integrity sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A== + dependencies: + whatwg-url "^5.0.0" + +onetime@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz#d0e96ebb56b07476df1dd9c4806e5237985ca45e" + integrity sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg== + dependencies: + mimic-fn "^2.1.0" + +openpgp@^5.11.1: + version "5.11.1" + resolved "https://registry.yarnpkg.com/openpgp/-/openpgp-5.11.1.tgz#97f3a1dfb3d3573a0a73fe2efb29e6b1f8fefb1c" + integrity sha512-TynUBPuaSI7dN0gP+A38CjNRLxkOkkptefNanalDQ71BFAKKm+dLbksymSW5bUrB7RcAneMySL/Y+r/TbLpOnQ== + dependencies: + asn1.js "^5.0.0" + +p-limit@^2.0.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz#3dd33c647a214fdfffd835933eb086da0dc21db1" + integrity sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w== + dependencies: + p-try "^2.0.0" + +p-locate@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/p-locate/-/p-locate-3.0.0.tgz#322d69a05c0264b25997d9f40cd8a891ab0064a4" + integrity sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ== + dependencies: + p-limit "^2.0.0" + +p-try@^2.0.0: + version "2.2.0" + resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" + integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== + +path-exists@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515" + integrity sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ== + +pkg-up@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-3.1.0.tgz#100ec235cc150e4fd42519412596a28512a0def5" + integrity sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA== + dependencies: + find-up "^3.0.0" + +punycode@^2.1.0, punycode@^2.3.1: + version "2.3.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.3.1.tgz#027422e2faec0b25e1549c3e1bd8309b9133b6e5" + integrity sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg== + +queue@6.0.2: + version "6.0.2" + resolved "https://registry.yarnpkg.com/queue/-/queue-6.0.2.tgz#b91525283e2315c7553d2efa18d83e76432fed65" + integrity sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA== + dependencies: + inherits "~2.0.3" + +"register-scheme@github:devsnek/node-register-scheme": + version "0.0.2" + resolved "https://codeload.github.com/devsnek/node-register-scheme/tar.gz/e7cc9a63a1f512565da44cb57316d9fb10750e17" + dependencies: + bindings "^1.3.0" + node-addon-api "^1.3.0" + +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +safer-buffer@^2.1.0: + version "2.1.2" + resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" + integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== + +semver@^7.3.5: + version "7.6.0" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.6.0.tgz#1a46a4db4bffcccd97b743b5005c8325f23d4e2d" + integrity sha512-EnwXhrlwXMk9gKu5/flx5sv/an57AkRplG3hTK68W7FRDN+k+OWBj65M7719OkA82XLBxrcX0KSHj+X5COhOVg== + dependencies: + lru-cache "^6.0.0" + +systeminformation@^5.22.0: + version "5.22.7" + resolved "https://registry.yarnpkg.com/systeminformation/-/systeminformation-5.22.7.tgz#9a20810c7eacad4aebe7591cb7c78c0dd96dbd1a" + integrity sha512-AWxlP05KeHbpGdgvZkcudJpsmChc2Y5Eo/GvxG/iUA/Aws5LZKHAMSeAo+V+nD+nxWZaxrwpWcnx4SH3oxNL3A== + +tr46@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-5.0.0.tgz#3b46d583613ec7283020d79019f1335723801cec" + integrity sha512-tk2G5R2KRwBd+ZN0zaEXpmzdKyOYksXwywulIX95MBODjSzMIuQnQ3m8JxgbhnL1LeVo7lqQKsYa1O3Htl7K5g== + dependencies: + punycode "^2.3.1" + +tr46@~0.0.3: + version "0.0.3" + resolved "https://registry.yarnpkg.com/tr46/-/tr46-0.0.3.tgz#8184fd347dac9cdc185992f3a6622e14b9d9ab6a" + integrity sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw== + +type-fest@^2.17.0: + version "2.19.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.19.0.tgz#88068015bb33036a598b952e55e9311a60fd3a9b" + integrity sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA== + +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" + +webidl-conversions@^3.0.0: + version "3.0.1" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-3.0.1.tgz#24534275e2a7bc6be7bc86611cc16ae0a5654871" + integrity sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ== + +webidl-conversions@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-7.0.0.tgz#256b4e1882be7debbf01d05f0aa2039778ea080a" + integrity sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g== + +whatwg-url@^14.0.0: + version "14.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-14.0.0.tgz#00baaa7fd198744910c4b1ef68378f2200e4ceb6" + integrity sha512-1lfMEm2IEr7RIV+f4lUNPOqfFL+pO+Xw3fJSqmjX9AbXcXcYOkCe1P6+9VBZB6n94af16NfZf+sSk0JCBZC9aw== + dependencies: + tr46 "^5.0.0" + webidl-conversions "^7.0.0" + +whatwg-url@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-5.0.0.tgz#966454e8765462e37644d3626f6742ce8b70965d" + integrity sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw== + dependencies: + tr46 "~0.0.3" + webidl-conversions "^3.0.0" + +ws@^7.3.1: + version "7.5.9" + resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.9.tgz#54fa7db29f4c7cec68b1ddd3a89de099942bb591" + integrity sha512-F+P9Jil7UiSKSkppIiD94dN07AwvFixvLIj1Og1Rl9GGMuNipJnV9JzjD6XuqmAeiswGvUmNLjr5cFuXwNS77Q== + +xmldom@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.6.0.tgz#43a96ecb8beece991cef382c08397d82d4d0c46f" + integrity sha512-iAcin401y58LckRZ0TkI4k0VSM1Qg0KGSc3i8rU+xrxe19A/BN1zHyVSJY7uoutVlaTSzYyk/v5AmkewAP7jtg== + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== From 0def320369b49a9adb5e1ca98f0609a7c55a0de8 Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Mon, 8 Apr 2024 12:21:50 +0200 Subject: [PATCH 22/89] maestral-qt: use qt6Packages.callPackage --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 31b97fc21e1c..2591ae39062f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34732,7 +34732,7 @@ with pkgs; maestral = with python3Packages; toPythonApplication maestral; - maestral-gui = qt6.callPackage ../applications/networking/maestral-qt { }; + maestral-gui = qt6Packages.callPackage ../applications/networking/maestral-qt { }; maestro = callPackage ../development/mobile/maestro { }; From f50717107777b99f32c931fd55a6ec4a9cb3e51f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 12 Apr 2024 12:57:43 -0700 Subject: [PATCH 23/89] python312Packages.srpenergy: 1.3.6 -> 1.3.7 Diff: https://github.com/lamoreauxlab/srpenergy-api-client-python/compare/refs/tags/1.3.6...1.3.7 Changelog: https://github.com/lamoreauxlab/srpenergy-api-client-python/releases/tag/1.3.7 --- .../python-modules/srpenergy/default.nix | 23 ++++++++++++++----- 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/srpenergy/default.nix b/pkgs/development/python-modules/srpenergy/default.nix index 35a937f96088..8d82ad614d0d 100644 --- a/pkgs/development/python-modules/srpenergy/default.nix +++ b/pkgs/development/python-modules/srpenergy/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , pythonOlder , fetchFromGitHub +, setuptools , python-dateutil , requests , pytestCheckHook @@ -9,19 +10,28 @@ buildPythonPackage rec { pname = "srpenergy"; - version = "1.3.6"; - format = "setuptools"; + version = "1.3.7"; + pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.9"; src = fetchFromGitHub { owner = "lamoreauxlab"; repo = "srpenergy-api-client-python"; - rev = version; - hash = "sha256-aZnqGtfklWgigac2gdkQv29Qy5HC34zGGY2iWr2cOMo="; + rev = "refs/tags/${version}"; + hash = "sha256-bdBF5y9hRj4rceUD5qjHOM9TIaHGElJ36YjWCJgCzX8="; }; - propagatedBuildInputs = [ + postPatch = '' + substituteInPlace pyproject.toml \ + --replace-fail "setuptools==" "setuptools>=" + ''; + + build-system = [ + setuptools + ]; + + dependencies = [ python-dateutil requests ]; @@ -33,6 +43,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "srpenergy.client" ]; meta = with lib; { + changelog = "https://github.com/lamoreauxlab/srpenergy-api-client-python/releases/tag/${version}"; description = "Unofficial Python module for interacting with Srp Energy data"; homepage = "https://github.com/lamoreauxlab/srpenergy-api-client-python"; license = licenses.mit; From 0ffde8d0c894dd34b138ae4af879753bd8b6d91c Mon Sep 17 00:00:00 2001 From: Raymond Douglas Date: Fri, 12 Apr 2024 16:48:58 -0700 Subject: [PATCH 24/89] omnictl: init at 0.32.2 --- pkgs/by-name/om/omnictl/package.nix | 40 +++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 pkgs/by-name/om/omnictl/package.nix diff --git a/pkgs/by-name/om/omnictl/package.nix b/pkgs/by-name/om/omnictl/package.nix new file mode 100644 index 000000000000..4f803fe35626 --- /dev/null +++ b/pkgs/by-name/om/omnictl/package.nix @@ -0,0 +1,40 @@ +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: + +buildGoModule rec { + pname = "omnictl"; + version = "0.32.2"; + + src = fetchFromGitHub { + owner = "siderolabs"; + repo = "omni"; + rev = "v${version}"; + hash = "sha256-db/bYwMPrOZvD/YPtFaRK80yaYdsE70YPh0xQe0uVi4="; + }; + + vendorHash = "sha256-uwzVUdA51eT9fi2Wr0ilNPMpXx430UIYYWXQa1hpzRM="; + + ldflags = [ "-s" "-w" ]; + + GOWORK = "off"; + + subPackages = [ "cmd/omnictl" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd omnictl \ + --bash <($out/bin/omnictl completion bash) \ + --fish <($out/bin/omnictl completion fish) \ + --zsh <($out/bin/omnictl completion zsh) + ''; + + doCheck = false; # no tests + + meta = with lib; { + description = "A CLI for the Sidero Omni Kubernetes management platform"; + mainProgram = "omnictl"; + homepage = "https://omni.siderolabs.com/"; + license = licenses.bsl11; + maintainers = with maintainers; [ raylas ]; + }; +} From ee8d3f1805baf0b077f2b4080d27087b66a4b123 Mon Sep 17 00:00:00 2001 From: Raymond Douglas Date: Fri, 12 Apr 2024 20:27:14 -0700 Subject: [PATCH 25/89] maintainer: add raylas --- maintainers/maintainer-list.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 654c7eefcdb8..a5b5475cae3b 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -16600,6 +16600,12 @@ githubId = 145816; name = "David McKay"; }; + raylas = { + email = "r@raymond.sh"; + github = "raylas"; + githubId = 8099415; + name = "Raymond Douglas"; + }; rayslash = { email = "stevemathewjoy@tutanota.com"; github = "rayslash"; From a783e721470cf4fb07b1ac37614f32b753b14aca Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 08:12:17 +0000 Subject: [PATCH 26/89] elasticmq-server-bin: 1.5.8 -> 1.6.0 --- pkgs/servers/elasticmq-server-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix index 9da82d41996f..395ac3609514 100644 --- a/pkgs/servers/elasticmq-server-bin/default.nix +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation (finalAttrs: { pname = "elasticmq-server"; - version = "1.5.8"; + version = "1.6.0"; src = fetchurl { url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${finalAttrs.pname}-${finalAttrs.version}.jar"; - sha256 = "sha256-7E1fkMPPwPUEZUL/VqTX0DSdL5mUlSlf7lDE1jNb3Ns="; + sha256 = "sha256-h71YX8mP9iB92gK+QQD/xl1JLZwKspAwE6D3wq+SOkU="; }; # don't do anything? From 9ea353aa8d6fb8065c8843063329293a58f7388c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 11:27:53 +0000 Subject: [PATCH 27/89] cemu: 2.0-74 -> 2.0-78 --- pkgs/applications/emulators/cemu/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/emulators/cemu/default.nix b/pkgs/applications/emulators/cemu/default.nix index 2b3f5e28a8cf..26230f8d72a7 100644 --- a/pkgs/applications/emulators/cemu/default.nix +++ b/pkgs/applications/emulators/cemu/default.nix @@ -46,13 +46,13 @@ let in stdenv.mkDerivation rec { pname = "cemu"; - version = "2.0-74"; + version = "2.0-78"; src = fetchFromGitHub { owner = "cemu-project"; repo = "Cemu"; rev = "v${version}"; - hash = "sha256-taV2HEKRUQ7k5BpgA3nwVzX8qkTN02O9kqswjdCHod0="; + hash = "sha256-ivdqO44+8sDgOshUDFc+4eTgzcEDSiPPIawyktYpob4="; }; patches = [ From 1c15b11b2b1da12aa2b3eba08667d4743b472342 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 14 Apr 2024 22:28:58 +0000 Subject: [PATCH 28/89] subtitleedit: 4.0.4 -> 4.0.5 --- pkgs/applications/video/subtitleedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/subtitleedit/default.nix b/pkgs/applications/video/subtitleedit/default.nix index d47889857ed0..924f0fc44e0e 100644 --- a/pkgs/applications/video/subtitleedit/default.nix +++ b/pkgs/applications/video/subtitleedit/default.nix @@ -18,11 +18,11 @@ stdenv.mkDerivation rec { pname = "subtitleedit"; - version = "4.0.4"; + version = "4.0.5"; src = fetchzip { url = "https://github.com/SubtitleEdit/subtitleedit/releases/download/${version}/SE${lib.replaceStrings [ "." ] [ "" ] version}.zip"; - hash = "sha256-9z9igHU/23KHOd1TM3Wd7y5kl19cg3D9AQ2MjH5av20="; + hash = "sha256-qYDLUqC5adzpmlQIq/EKmrkN8D8/EHZmP8QUGAaYf+s="; stripRoot = false; }; From c5f785558891d33e6f71ffde89b1bd93e133ac47 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 15 Apr 2024 02:14:54 +0000 Subject: [PATCH 29/89] python312Packages.mdformat-admon: 2.0.2 -> 2.0.3 --- pkgs/development/python-modules/mdformat-admon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mdformat-admon/default.nix b/pkgs/development/python-modules/mdformat-admon/default.nix index 10be705e1440..7025864b440a 100644 --- a/pkgs/development/python-modules/mdformat-admon/default.nix +++ b/pkgs/development/python-modules/mdformat-admon/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "mdformat-admon"; - version = "2.0.2"; + version = "2.0.3"; pyproject = true; disabled = pythonOlder "3.8"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "KyleKing"; repo = "mdformat-admon"; rev = "refs/tags/v${version}"; - hash = "sha256-TybbkF6+dIfG+1fGYp+bTEdw2GXINZJfOX0QiAaqiWY="; + hash = "sha256-zKc0kKap4ipZ+P+RYDXcwqyzq9NKcTnCmx64cApFxFg="; }; nativeBuildInputs = [ From 0ccb80a68d58182a19a73dbd5bc633d916440313 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 10:59:07 -0700 Subject: [PATCH 30/89] avrdude: use libusb1 as upstream is compatible now --- pkgs/development/embedded/avrdude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 924c50235821..3360ad2b89e0 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb-compat-0_1, libelf +{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, libelf , libftdi1, readline, libserialport # documentation building is broken on darwin , docSupport ? (!stdenv.isDarwin), texliveMedium, texinfo, texi2html, unixtools }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { texi2html ]; - buildInputs = [ libusb-compat-0_1 libelf libftdi1 libserialport readline ]; + buildInputs = [ libusb1 libelf libftdi1 libserialport readline ]; cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" From 0665935e754fdd119db5f8578b397bf1c6d25eb7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 11:02:40 -0700 Subject: [PATCH 31/89] avrdude: enable hidapi support, as it builds on both linux and darwin --- pkgs/development/embedded/avrdude/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 3360ad2b89e0..0e957f837c60 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, libelf -, libftdi1, readline, libserialport +, libftdi1, readline, libserialport, hidapi # documentation building is broken on darwin , docSupport ? (!stdenv.isDarwin), texliveMedium, texinfo, texi2html, unixtools }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { texi2html ]; - buildInputs = [ libusb1 libelf libftdi1 libserialport readline ]; + buildInputs = [ hidapi libusb1 libelf libftdi1 libserialport readline ]; cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" From 837069946a05dc39943fc8500623774c9b4c7d04 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 11:35:36 -0700 Subject: [PATCH 32/89] avrdude: document more about why documentation building doesn't work on darwin --- pkgs/development/embedded/avrdude/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 0e957f837c60..68b819e38c6b 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,7 +1,10 @@ { lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, libelf -, libftdi1, readline, libserialport, hidapi -# documentation building is broken on darwin -, docSupport ? (!stdenv.isDarwin), texliveMedium, texinfo, texi2html, unixtools }: +, libftdi1, readline, hidapi, libserialport +# Documentation building doesn't work on Darwin. It fails with: +# Undefined subroutine &Locale::Messages::dgettext called in ... texi2html +# +# https://github.com/NixOS/nixpkgs/issues/224761 +, docSupport ? (!stdenv.hostPlatform.isDarwin), texliveMedium, texinfo, texi2html, unixtools }: stdenv.mkDerivation rec { pname = "avrdude"; From 84604bb80de8e6909df4eba2bd00ebb0ac303296 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 11:42:16 -0700 Subject: [PATCH 33/89] avrdude: turn on SPI support on Linux --- pkgs/development/embedded/avrdude/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 68b819e38c6b..31f6f26496e2 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -26,9 +26,8 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libusb1 libelf libftdi1 libserialport readline ]; - cmakeFlags = lib.optionals docSupport [ - "-DBUILD_DOC=ON" - ]; + cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" ] + ++ lib.optionals docSupport [ "-DBUILD_DOC=ON" ]; # dvips output references texlive in comments, resulting in a huge closure postInstall = lib.optionalString docSupport '' From 472fb7ce50ffb750e4d4b6d1bb86501133018db2 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 12:23:18 -0700 Subject: [PATCH 34/89] avrdude: explain why we don't turn HAVE_LINUXGPIO on --- pkgs/development/embedded/avrdude/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 31f6f26496e2..423ca7934a94 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -26,6 +26,10 @@ stdenv.mkDerivation rec { buildInputs = [ hidapi libusb1 libelf libftdi1 libserialport readline ]; + # Not used: + # + # -DHAVE_LINUXGPIO=ON because it's incompatible with libgpiod 2.x + # cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" ] ++ lib.optionals docSupport [ "-DBUILD_DOC=ON" ]; From 98e8fbee79016d30d2268a99473cbe88598184d2 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 12:45:44 -0700 Subject: [PATCH 35/89] avrdude: enable parallel port support on Linux (it doesn't work on macOS) --- pkgs/development/embedded/avrdude/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index 423ca7934a94..f03efa1dc820 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -30,7 +30,8 @@ stdenv.mkDerivation rec { # # -DHAVE_LINUXGPIO=ON because it's incompatible with libgpiod 2.x # - cmakeFlags = lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" ] + cmakeFlags = [ ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" "-DHAVE_PARPORT=ON" ] ++ lib.optionals docSupport [ "-DBUILD_DOC=ON" ]; # dvips output references texlive in comments, resulting in a huge closure From cf52591a0a179e2296cc14f53b9611b43ab9f594 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sat, 22 Oct 2022 12:01:05 +0200 Subject: [PATCH 36/89] nixos/manticore: init module --- .../manual/release-notes/rl-2405.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/search/manticore.nix | 131 ++++++++++++++++++ 3 files changed, 134 insertions(+) create mode 100644 nixos/modules/services/search/manticore.nix diff --git a/nixos/doc/manual/release-notes/rl-2405.section.md b/nixos/doc/manual/release-notes/rl-2405.section.md index 988632fc4434..3c156e528bbc 100644 --- a/nixos/doc/manual/release-notes/rl-2405.section.md +++ b/nixos/doc/manual/release-notes/rl-2405.section.md @@ -104,6 +104,8 @@ Use `services.pipewire.extraConfig` or `services.pipewire.configPackages` for Pi - [dnsproxy](https://github.com/AdguardTeam/dnsproxy), a simple DNS proxy with DoH, DoT, DoQ and DNSCrypt support. Available as [services.dnsproxy](#opt-services.dnsproxy.enable). +- [manticoresearch](https://manticoresearch.com), easy to use open source fast database for search. Available as [services.manticore](#opt-services.manticore.enable). + - [rspamd-trainer](https://gitlab.com/onlime/rspamd-trainer), script triggered by a helper which reads mails from a specific mail inbox and feeds them into rspamd for spam/ham training. - [ollama](https://ollama.ai), server for running large language models locally. diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a45507d5ee3c..8d63c48ad03a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1219,6 +1219,7 @@ ./services/search/elasticsearch-curator.nix ./services/search/elasticsearch.nix ./services/search/hound.nix + ./services/search/manticore.nix ./services/search/meilisearch.nix ./services/search/opensearch.nix ./services/search/qdrant.nix diff --git a/nixos/modules/services/search/manticore.nix b/nixos/modules/services/search/manticore.nix new file mode 100644 index 000000000000..a8fcd9d0b382 --- /dev/null +++ b/nixos/modules/services/search/manticore.nix @@ -0,0 +1,131 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.manticore; + format = pkgs.formats.json { }; + + toSphinx = { + mkKeyValue ? mkKeyValueDefault {} "=", + listsAsDuplicateKeys ? true + }: attrsOfAttrs: + let + # map function to string for each key val + mapAttrsToStringsSep = sep: mapFn: attrs: + concatStringsSep sep + (mapAttrsToList mapFn attrs); + mkSection = sectName: sectValues: '' + ${sectName} { + '' + lib.generators.toKeyValue { inherit mkKeyValue listsAsDuplicateKeys; } sectValues + ''}''; + in + # map input to ini sections + mapAttrsToStringsSep "\n" mkSection attrsOfAttrs; + + configFile = pkgs.writeText "manticore.conf" ( + toSphinx { + mkKeyValue = k: v: " ${k} = ${v}"; + } cfg.settings + ); + +in { + + options = { + services.manticore = { + + enable = mkEnableOption "Manticoresearch"; + + settings = mkOption { + default = { + searchd = { + listen = [ + "127.0.0.1:9312" + "127.0.0.1:9306:mysql" + "127.0.0.1:9308:http" + ]; + log = "/var/log/manticore/searchd.log"; + query_log = "/var/log/manticore/query.log"; + pid_file = "/run/manticore/searchd.pid"; + data_dir = "/var/lib/manticore"; + }; + }; + description = '' + Configuration for Manticoresearch. See + + for more information. + ''; + type = types.submodule { + freeformType = format.type; + }; + example = literalExpression '' + { + searchd = { + listen = [ + "127.0.0.1:9312" + "127.0.0.1:9306:mysql" + "127.0.0.1:9308:http" + ]; + log = "/var/log/manticore/searchd.log"; + query_log = "/var/log/manticore/query.log"; + pid_file = "/run/manticore/searchd.pid"; + data_dir = "/var/lib/manticore"; + }; + } + ''; + }; + + }; + }; + + config = mkIf cfg.enable { + + systemd = { + packages = [ pkgs.manticoresearch ]; + services.manticore = { + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = [ + "" + "${pkgs.manticoresearch}/bin/searchd --config ${configFile}" + ]; + ExecStop = [ + "" + "${pkgs.manticoresearch}/bin/searchd --config ${configFile} --stopwait" + ]; + ExecStartPre = [ "" ]; + DynamicUser = true; + LogsDirectory = "manticore"; + RuntimeDirectory = "manticore"; + StateDirectory = "manticore"; + ReadWritePaths = ""; + CapabilityBoundingSet = ""; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + PrivateDevices = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" "~@privileged" ]; + RestrictRealtime = true; + LockPersonality = true; + MemoryDenyWriteExecute = true; + UMask = "0066"; + ProtectHostname = true; + } // lib.optionalAttrs (cfg.settings.searchd.pid_file != null) { + PIDFile = cfg.settings.searchd.pid_file; + }; + }; + }; + + }; + + meta.maintainers = with lib.maintainers; [ onny ]; + +} From 8eac0d279de51ff91ab4470e73c70edffc6ee111 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 17 Apr 2024 16:37:37 +0000 Subject: [PATCH 37/89] python312Packages.editdistpy: 0.1.3 -> 0.1.4 --- pkgs/development/python-modules/editdistpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/editdistpy/default.nix b/pkgs/development/python-modules/editdistpy/default.nix index a785e1b05b67..213f2d254dfc 100644 --- a/pkgs/development/python-modules/editdistpy/default.nix +++ b/pkgs/development/python-modules/editdistpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "editdistpy"; - version = "0.1.3"; + version = "0.1.4"; pyproject = true; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "mammothb"; repo = "editdistpy"; rev = "refs/tags/v${version}"; - hash = "sha256-4CtKadKpFmlZnz10NG0404oFl9DkdQwWwRSWgUPdh94="; + hash = "sha256-OSJXiuJtZ4w1IiRaZQZH2DDxA0AGoRHp0BKXdysff0Y="; }; build-system = [ From 8f1ccb4eae3975d66e2c0506a025b499481e79c2 Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Wed, 17 Apr 2024 23:47:18 +0200 Subject: [PATCH 38/89] zed-editor: 0.130.7 -> 0.131.6 Diff: https://github.com/zed-industries/zed/compare/refs/tags/v0.130.7...0.131.6 Changelog: https://github.com/zed-industries/zed/releases/tag/v0.131.6 --- pkgs/by-name/ze/zed-editor/Cargo.lock | 223 ++++++++++++++++++++++--- pkgs/by-name/ze/zed-editor/package.nix | 7 +- 2 files changed, 199 insertions(+), 31 deletions(-) diff --git a/pkgs/by-name/ze/zed-editor/Cargo.lock b/pkgs/by-name/ze/zed-editor/Cargo.lock index 5e6ebe7f1758..04d3e032fb15 100644 --- a/pkgs/by-name/ze/zed-editor/Cargo.lock +++ b/pkgs/by-name/ze/zed-editor/Cargo.lock @@ -165,6 +165,12 @@ dependencies = [ "libc", ] +[[package]] +name = "anes" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4b46cbb362ab8752921c97e041f5e366ee6297bd428a31275b9fcf1e380f7299" + [[package]] name = "anstream" version = "0.5.0" @@ -1433,8 +1439,8 @@ dependencies = [ [[package]] name = "blade-graphics" -version = "0.3.0" -source = "git+https://github.com/kvark/blade?rev=61cbd6b2c224791d52b150fe535cee665cc91bb2#61cbd6b2c224791d52b150fe535cee665cc91bb2" +version = "0.4.0" +source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d25292b2ce4#810ec594358aafea29a4a3d8ab601d25292b2ce4" dependencies = [ "ash", "ash-window", @@ -1464,7 +1470,7 @@ dependencies = [ [[package]] name = "blade-macros" version = "0.2.1" -source = "git+https://github.com/kvark/blade?rev=61cbd6b2c224791d52b150fe535cee665cc91bb2#61cbd6b2c224791d52b150fe535cee665cc91bb2" +source = "git+https://github.com/kvark/blade?rev=810ec594358aafea29a4a3d8ab601d25292b2ce4#810ec594358aafea29a4a3d8ab601d25292b2ce4" dependencies = [ "proc-macro2", "quote", @@ -1806,6 +1812,12 @@ dependencies = [ "winx", ] +[[package]] +name = "cast" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" + [[package]] name = "castaway" version = "0.1.2" @@ -1914,6 +1926,33 @@ version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "cca491388666e04d7248af3f60f0c40cfb0991c72205595d7c396e3510207d1a" +[[package]] +name = "ciborium" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42e69ffd6f0917f5c029256a24d0161db17cea3997d185db0d35926308770f0e" +dependencies = [ + "ciborium-io", + "ciborium-ll", + "serde", +] + +[[package]] +name = "ciborium-io" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05afea1e0a06c9be33d539b876f1ce3692f4afea2cb41f740e7743225ed1c757" + +[[package]] +name = "ciborium-ll" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "57663b653d948a338bfb3eeba9bb2fd5fcfaecb9e199e87e1eda4d9e8b240fd9" +dependencies = [ + "ciborium-io", + "half", +] + [[package]] name = "cipher" version = "0.3.0" @@ -2783,6 +2822,42 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "criterion" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e7c76e09c1aae2bc52b3d2f29e13c6572553b30c4aa1b8a49fd70de6412654cb" +dependencies = [ + "anes", + "atty", + "cast", + "ciborium", + "clap 3.2.25", + "criterion-plot", + "itertools 0.10.5", + "lazy_static", + "num-traits", + "oorandom", + "plotters", + "rayon", + "regex", + "serde", + "serde_derive", + "serde_json", + "tinytemplate", + "walkdir", +] + +[[package]] +name = "criterion-plot" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6b50826342786a51a89e2da3a28f1c32b06e387201bc2d19791f622c673706b1" +dependencies = [ + "cast", + "itertools 0.10.5", +] + [[package]] name = "crossbeam-channel" version = "0.5.8" @@ -2836,6 +2911,12 @@ dependencies = [ "cfg-if", ] +[[package]] +name = "crunchy" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" + [[package]] name = "crypto-bigint" version = "0.4.9" @@ -4295,6 +4376,7 @@ dependencies = [ name = "go_to_line" version = "0.1.0" dependencies = [ + "anyhow", "editor", "gpui", "indoc", @@ -4302,7 +4384,10 @@ dependencies = [ "menu", "project", "rope", + "schemars", + "serde", "serde_json", + "settings", "text", "theme", "tree-sitter-rust", @@ -4479,6 +4564,16 @@ dependencies = [ "tracing", ] +[[package]] +name = "half" +version = "2.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dd08c532ae367adf81c312a4580bc67f1d0fe8bc9c460520283f4c0ff277888" +dependencies = [ + "cfg-if", + "crunchy", +] + [[package]] name = "hashbrown" version = "0.12.3" @@ -5339,7 +5434,6 @@ dependencies = [ "tree-sitter-c", "tree-sitter-cpp", "tree-sitter-css", - "tree-sitter-dart", "tree-sitter-elixir", "tree-sitter-elm", "tree-sitter-embedded-template", @@ -5349,7 +5443,6 @@ dependencies = [ "tree-sitter-gowork", "tree-sitter-hcl", "tree-sitter-heex", - "tree-sitter-html", "tree-sitter-jsdoc", "tree-sitter-json 0.20.0", "tree-sitter-lua", @@ -5678,10 +5771,13 @@ dependencies = [ name = "markdown_preview" version = "0.1.0" dependencies = [ + "anyhow", "async-recursion 1.0.5", "editor", "gpui", "language", + "linkify", + "log", "pretty_assertions", "pulldown-cmark", "theme", @@ -6399,6 +6495,12 @@ dependencies = [ "zvariant", ] +[[package]] +name = "oorandom" +version = "11.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + [[package]] name = "opaque-debug" version = "0.3.0" @@ -6879,6 +6981,34 @@ dependencies = [ "time", ] +[[package]] +name = "plotters" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +dependencies = [ + "num-traits", + "plotters-backend", + "plotters-svg", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "plotters-backend" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" + +[[package]] +name = "plotters-svg" +version = "0.3.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +dependencies = [ + "plotters-backend", +] + [[package]] name = "png" version = "0.16.8" @@ -7794,6 +7924,7 @@ version = "0.1.0" dependencies = [ "arrayvec 0.7.4", "bromberg_sl2", + "criterion", "gpui", "log", "rand 0.8.5", @@ -9498,16 +9629,19 @@ version = "0.1.0" dependencies = [ "anyhow", "editor", + "file_icons", "fuzzy", "gpui", "itertools 0.11.0", "language", - "menu", "picker", "project", + "schemars", "serde", "serde_json", + "settings", "task", + "terminal", "tree-sitter-rust", "tree-sitter-typescript", "ui", @@ -9828,6 +9962,16 @@ dependencies = [ "url", ] +[[package]] +name = "tinytemplate" +version = "1.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +dependencies = [ + "serde", + "serde_json", +] + [[package]] name = "tinyvec" version = "1.6.0" @@ -10219,15 +10363,6 @@ dependencies = [ "tree-sitter", ] -[[package]] -name = "tree-sitter-dart" -version = "0.0.1" -source = "git+https://github.com/agent3bood/tree-sitter-dart?rev=48934e3bf757a9b78f17bdfaa3e2b4284656fdc7#48934e3bf757a9b78f17bdfaa3e2b4284656fdc7" -dependencies = [ - "cc", - "tree-sitter", -] - [[package]] name = "tree-sitter-elixir" version = "0.1.0" @@ -12380,7 +12515,7 @@ dependencies = [ [[package]] name = "zed" -version = "0.130.7" +version = "0.131.6" dependencies = [ "activity_indicator", "anyhow", @@ -12492,6 +12627,20 @@ dependencies = [ "zed_extension_api 0.0.4", ] +[[package]] +name = "zed_dart" +version = "0.0.1" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_emmet" +version = "0.0.1" +dependencies = [ + "zed_extension_api 0.0.4", +] + [[package]] name = "zed_erlang" version = "0.0.1" @@ -12508,13 +12657,6 @@ dependencies = [ "wit-bindgen", ] -[[package]] -name = "zed_extension_api" -version = "0.0.5" -dependencies = [ - "wit-bindgen", -] - [[package]] name = "zed_extension_api" version = "0.0.5" @@ -12524,16 +12666,43 @@ dependencies = [ "wit-bindgen", ] +[[package]] +name = "zed_extension_api" +version = "0.0.6" +dependencies = [ + "serde", + "serde_json", + "wit-bindgen", +] + +[[package]] +name = "zed_extension_api" +version = "0.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "77ca8bcaea3feb2d2ce9dbeb061ee48365312a351faa7014c417b0365fe9e459" +dependencies = [ + "serde", + "serde_json", + "wit-bindgen", +] + [[package]] name = "zed_gleam" version = "0.0.2" dependencies = [ - "zed_extension_api 0.0.4", + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "zed_haskell" version = "0.0.1" +dependencies = [ + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", +] + +[[package]] +name = "zed_html" +version = "0.0.1" dependencies = [ "zed_extension_api 0.0.4", ] @@ -12563,14 +12732,14 @@ dependencies = [ name = "zed_svelte" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.4", + "zed_extension_api 0.0.6 (registry+https://github.com/rust-lang/crates.io-index)", ] [[package]] name = "zed_toml" version = "0.0.2" dependencies = [ - "zed_extension_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.5", ] [[package]] @@ -12584,7 +12753,7 @@ dependencies = [ name = "zed_zig" version = "0.0.1" dependencies = [ - "zed_extension_api 0.0.5 (registry+https://github.com/rust-lang/crates.io-index)", + "zed_extension_api 0.0.5", ] [[package]] diff --git a/pkgs/by-name/ze/zed-editor/package.nix b/pkgs/by-name/ze/zed-editor/package.nix index 6de47e35491e..d656f2a33e90 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.130.7"; + version = "0.131.6"; src = fetchFromGitHub { owner = "zed-industries"; repo = "zed"; rev = "refs/tags/v${version}"; - hash = "sha256-nGE4RjquH5tEz6vHR1f5F44TX4GtPwiPP3V3lWPpmxk="; + hash = "sha256-IhFOA+g2I5vb72CTSZ8WTa9K0ieYbPD/BMShGqaUb84="; fetchSubmodules = true; }; @@ -41,7 +41,7 @@ rustPlatform.buildRustPackage rec { lockFile = ./Cargo.lock; outputHashes = { "async-pipe-0.1.3" = "sha256-g120X88HGT8P6GNCrzpS5SutALx5H+45Sf4iSSxzctE="; - "blade-graphics-0.3.0" = "sha256-0TmunFnq9MBxm4TrAkI0PxB58qJEf7oWLWhHq5cVsQ8="; + "blade-graphics-0.4.0" = "sha256-S1PNdQ9YbJgLLsJU1mvDZ3feVDIrZGwU37JqIm+kfcE="; "bromberg_sl2-0.6.0" = "sha256-+bwdnk3EgYEAxQSP4KpEPicCfO+r2er1DRZjvfF4jSM="; "font-kit-0.11.0" = "sha256-+4zMzjFyMS60HfLMEXGfXqKn6P+pOngLA45udV09DM8="; "lsp-types-0.94.1" = "sha256-kplgPsafrgZFMI1D9pQCwmg+FKMn5HNWLbcgdXHUFVU="; @@ -52,7 +52,6 @@ rustPlatform.buildRustPackage rec { "tree-sitter-bash-0.20.4" = "sha256-VP7rJfE/k8KV1XN1w5f0YKjCnDMYU1go/up0zj1mabM="; "tree-sitter-cpp-0.20.0" = "sha256-2QYEFkpwcRmh2kf4qEAL2a5lGSa316CetOhF73e7rEM="; "tree-sitter-css-0.19.0" = "sha256-5Qti/bFac2A1PJxqZEOuSLK3GGKYwPDKAp3OOassBxU="; - "tree-sitter-dart-0.0.1" = "sha256-FE6zXy0lAUWWayrM3urZFnQaEYBcnmaVANcUUnvw1q4="; "tree-sitter-elixir-0.1.0" = "sha256-hBHqQ3eBjknRPJjP+lQJU6NPFhUMtiv4FbKsTw28Bog="; "tree-sitter-elm-5.6.4" = "sha256-0LpuyebOB5ew9fULBcaw8aUbF7HM5sXQpv+Jroz4tXg="; "tree-sitter-glsl-0.1.4" = "sha256-TRuiT3ndCeDCsCFokAN8cosNKccB0NjWVRiBJuBJXZw="; From 8340a977c74de9b11eb8c29802bc574aa4499caf Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:40:04 -0300 Subject: [PATCH 39/89] mednafen-server: migrate to by-name --- .../server.nix => by-name/me/mednafen-server/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/mednafen/server.nix => by-name/me/mednafen-server/package.nix} (100%) diff --git a/pkgs/applications/emulators/mednafen/server.nix b/pkgs/by-name/me/mednafen-server/package.nix similarity index 100% rename from pkgs/applications/emulators/mednafen/server.nix rename to pkgs/by-name/me/mednafen-server/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cedbc2535379..cc3f38afcade 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2750,8 +2750,6 @@ with pkgs; mednafen = callPackage ../applications/emulators/mednafen { }; - mednafen-server = callPackage ../applications/emulators/mednafen/server.nix { }; - mednaffe = callPackage ../applications/emulators/mednaffe { }; melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; From f5d6dcb4b9cacefac1bc3679c77af114fa2e24b7 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:41:32 -0300 Subject: [PATCH 40/89] mednafen: migrate to by-name --- .../mednafen/default.nix => by-name/me/mednafen/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/mednafen/default.nix => by-name/me/mednafen/package.nix} (100%) diff --git a/pkgs/applications/emulators/mednafen/default.nix b/pkgs/by-name/me/mednafen/package.nix similarity index 100% rename from pkgs/applications/emulators/mednafen/default.nix rename to pkgs/by-name/me/mednafen/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc3f38afcade..c8a80bc032bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2748,8 +2748,6 @@ with pkgs; description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - mednafen = callPackage ../applications/emulators/mednafen { }; - mednaffe = callPackage ../applications/emulators/mednaffe { }; melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; From 0376b74f0da92d43e4350412b0ea1219d96e9ba5 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 20:41:45 -0300 Subject: [PATCH 41/89] mednaffe: migrate to by-name --- .../mednaffe/default.nix => by-name/me/mednaffe/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{applications/emulators/mednaffe/default.nix => by-name/me/mednaffe/package.nix} (100%) diff --git a/pkgs/applications/emulators/mednaffe/default.nix b/pkgs/by-name/me/mednaffe/package.nix similarity index 100% rename from pkgs/applications/emulators/mednaffe/default.nix rename to pkgs/by-name/me/mednaffe/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8a80bc032bd..b1328e30de6c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2748,8 +2748,6 @@ with pkgs; description = mame.meta.description + " (tools only)"; } (lib.getOutput "tools" mame); - mednaffe = callPackage ../applications/emulators/mednaffe { }; - melonDS = libsForQt5.callPackage ../applications/emulators/melonDS { }; mgba = libsForQt5.callPackage ../applications/emulators/mgba { }; From 8ef2b87e00c837b21a44144b1479240e871b1d1e Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 21:40:22 -0300 Subject: [PATCH 42/89] mednafen-server: refactor - finalAttrs - strictDeps --- pkgs/by-name/me/mednafen-server/package.nix | 28 +++++++++++++-------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/pkgs/by-name/me/mednafen-server/package.nix b/pkgs/by-name/me/mednafen-server/package.nix index 3e11ff41d48d..59247cf46c59 100644 --- a/pkgs/by-name/me/mednafen-server/package.nix +++ b/pkgs/by-name/me/mednafen-server/package.nix @@ -1,22 +1,30 @@ -{ lib, stdenv, fetchurl }: +{ + lib, + stdenv, + fetchurl, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mednafen-server"; version = "0.5.2"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/mednafen-server-${version}.tar.xz"; - sha256 = "0xm7dj5nwnrsv69r72rcnlw03jm0l8rmrg3s05gjfvxyqmlb36dq"; + url = "https://mednafen.github.io/releases/files/mednafen-server-${finalAttrs.version}.tar.xz"; + hash = "sha256-uJmxaMW+bydfAXq8XDOioMoBOLUsi5OT2Tpbbotsp3Y="; }; - postInstall = "install -m 644 -Dt $out/share/mednafen-server standard.conf"; + strictDeps = true; - meta = with lib; { + postInstall = '' + install -m 644 -Dt $out/share/mednafen-server standard.conf + ''; + + meta = { description = "Netplay server for Mednafen"; mainProgram = "mednafen-server"; homepage = "https://mednafen.github.io/"; - license = licenses.gpl2; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From 78fddb998897497830827471d2a11c1e4a12cf28 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 21:16:23 -0300 Subject: [PATCH 43/89] mednafen: refactor - finalAttrs - strictDeps --- pkgs/by-name/me/mednafen/package.nix | 69 ++++++++++++++++------------ 1 file changed, 40 insertions(+), 29 deletions(-) diff --git a/pkgs/by-name/me/mednafen/package.nix b/pkgs/by-name/me/mednafen/package.nix index 816b6c1bd4d7..057f3ed4cf13 100644 --- a/pkgs/by-name/me/mednafen/package.nix +++ b/pkgs/by-name/me/mednafen/package.nix @@ -1,33 +1,39 @@ -{ lib -, stdenv -, fetchurl -, SDL2 -, SDL2_net -, alsa-lib -, flac -, freeglut -, libGL -, libGLU -, libX11 -, libcdio -, libjack2 -, libsamplerate -, libsndfile -, pkg-config -, zlib -, libiconv +{ + lib, + SDL2, + SDL2_net, + alsa-lib, + fetchurl, + flac, + freeglut, + libGL, + libGLU, + libX11, + libcdio, + libiconv, + libjack2, + libsamplerate, + libsndfile, + pkg-config, + stdenv, + zlib, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mednafen"; version = "1.29.0"; src = fetchurl { - url = "https://mednafen.github.io/releases/files/${pname}-${version}.tar.xz"; + url = "https://mednafen.github.io/releases/files/mednafen-${finalAttrs.version}.tar.xz"; hash = "sha256-2j+88Ch3+b4PAov6XRy1npU6QEm5D+fjk4ijOG2fNi4="; }; - nativeBuildInputs = [ pkg-config ]; + outputs = [ "out" "doc" ]; + + nativeBuildInputs = [ + SDL2 + pkg-config + ]; buildInputs = [ SDL2 @@ -48,16 +54,21 @@ stdenv.mkDerivation rec { libiconv ]; - hardeningDisable = [ "pic" "format" ]; + hardeningDisable = [ + "format" + "pic" + ]; enableParallelBuilding = true; + strictDeps = true; + postInstall = '' - mkdir -p $out/share/doc - mv Documentation $out/share/doc/mednafen + mkdir -p $doc/share/doc + mv Documentation $doc/share/doc/mednafen ''; - meta = with lib; { + meta = { homepage = "https://mednafen.github.io/"; description = "A portable, CLI-driven, SDL+OpenGL-based, multi-system emulator"; longDescription = '' @@ -91,9 +102,9 @@ stdenv.mkDerivation rec { - Sega Saturn (experimental, x86_64 only) - Sony PlayStation ''; - license = licenses.gpl2Plus; - maintainers = with maintainers; [ AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl2Plus; mainProgram = "mednafen"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From 8a065e47ddf2119b1beaeab81982eac949f1008c Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 21:55:46 -0300 Subject: [PATCH 44/89] mednaffe: refactor - finalAttrs - strictDeps --- pkgs/by-name/me/mednaffe/package.nix | 46 +++++++++++++++++----------- 1 file changed, 28 insertions(+), 18 deletions(-) diff --git a/pkgs/by-name/me/mednaffe/package.nix b/pkgs/by-name/me/mednaffe/package.nix index 75a25a4bec3b..60704158d6a5 100644 --- a/pkgs/by-name/me/mednaffe/package.nix +++ b/pkgs/by-name/me/mednaffe/package.nix @@ -1,42 +1,52 @@ -{ stdenv -, lib -, fetchFromGitHub -, autoreconfHook -, pkg-config -, mednafen -, gtk3 -, wrapGAppsHook +{ + lib, + autoreconfHook, + fetchFromGitHub, + gtk3, + mednafen, + pkg-config, + stdenv, + wrapGAppsHook, }: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "mednaffe"; version = "0.9.2"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; - rev = version; - sha256 = "sha256-zvSAt6CMcgdoPpTTA5sPlQaWUw9LUMsR2Xg9jM2UaWY="; + rev = finalAttrs.version; + hash = "sha256-zvSAt6CMcgdoPpTTA5sPlQaWUw9LUMsR2Xg9jM2UaWY="; }; - nativeBuildInputs = [ autoreconfHook pkg-config wrapGAppsHook ]; + nativeBuildInputs = [ + autoreconfHook + pkg-config + wrapGAppsHook + ]; - buildInputs = [ gtk3 mednafen ]; + buildInputs = [ + gtk3 + mednafen + ]; enableParallelBuilding = true; + strictDeps = true; + preFixup = '' gappsWrapperArgs+=( --prefix PATH ':' "${mednafen}/bin" ) ''; - meta = with lib; { + meta = { description = "GTK-based frontend for mednafen emulator"; mainProgram = "mednaffe"; homepage = "https://github.com/AmatCoder/mednaffe"; - license = licenses.gpl3Plus; - maintainers = with maintainers; [ sheenobu yana AndersonTorres ]; - platforms = platforms.unix; + license = lib.licenses.gpl3Plus; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.unix; }; -} +}) From bd75a7b3cb2651b8aceb6ee9479808ec29d301d6 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Wed, 17 Apr 2024 22:25:17 -0300 Subject: [PATCH 45/89] mednaffe: 0.9.2 -> 0.9.3 Co-authored-by: R. RyanTM --- pkgs/by-name/me/mednaffe/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/me/mednaffe/package.nix b/pkgs/by-name/me/mednaffe/package.nix index 60704158d6a5..5625c380eaa7 100644 --- a/pkgs/by-name/me/mednaffe/package.nix +++ b/pkgs/by-name/me/mednaffe/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "mednaffe"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "AmatCoder"; repo = "mednaffe"; rev = finalAttrs.version; - hash = "sha256-zvSAt6CMcgdoPpTTA5sPlQaWUw9LUMsR2Xg9jM2UaWY="; + hash = "sha256-ZizW0EeY/Cc68m87cnbLAkx3G/ULyFT5b6Ku2ObzFRU="; }; nativeBuildInputs = [ From b7c056556fb56343041a025370addbd68f0cbf19 Mon Sep 17 00:00:00 2001 From: toonn Date: Sat, 30 Mar 2024 20:22:15 +0100 Subject: [PATCH 46/89] wire-desktop: mac 3.32.4589 -> 3.35.4861 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 9aaba98710e3..6800e845b2f7 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -26,7 +26,7 @@ let pname = "wire-desktop"; version = let - x86_64-darwin = "3.32.4589"; + x86_64-darwin = "3.35.4861"; in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; @@ -34,7 +34,7 @@ let }.${system} or throwSystem; hash = let - x86_64-darwin = "sha256-PDAZCnkgzlausdtwycK+PHfp+zmL33VnX6RzCsgBTZ4="; + x86_64-darwin = "sha256-QPxslMEz1jOH2LceFOdCyVDtpya1SfJ8GWMIAIhie4U="; in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; From d589b55536073733cd5e4008ef6ef615640082c0 Mon Sep 17 00:00:00 2001 From: toonn Date: Sat, 30 Mar 2024 20:23:57 +0100 Subject: [PATCH 47/89] wire-desktop: linux 3.32.3079 -> 3.35.3348 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 6800e845b2f7..4109c5f04cf2 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -30,7 +30,7 @@ let in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "3.32.3079"; + x86_64-linux = "3.35.3348"; }.${system} or throwSystem; hash = let @@ -38,7 +38,7 @@ let in { inherit x86_64-darwin; aarch64-darwin = x86_64-darwin; - x86_64-linux = "sha256-+4aRis141ctI50BtBwipoVtPoMGRs82ENqZ+y2ZlL58="; + x86_64-linux = "sha256-KtDUuAzD53mFJ0+yywp0Q2/hx9MGsOhFjRLWsZAd+h0="; }.${system} or throwSystem; meta = with lib; { From 9600d35b6bab2b9e83cc1c168b6c696f40a02002 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 18 Apr 2024 14:24:37 +0000 Subject: [PATCH 48/89] python312Packages.oelint-parser: 3.4.0 -> 3.4.1 --- pkgs/development/python-modules/oelint-parser/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/oelint-parser/default.nix b/pkgs/development/python-modules/oelint-parser/default.nix index ab9f362de4e6..179ecd1a312e 100644 --- a/pkgs/development/python-modules/oelint-parser/default.nix +++ b/pkgs/development/python-modules/oelint-parser/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "oelint-parser"; - version = "3.4.0"; + version = "3.4.1"; format = "setuptools"; src = fetchPypi { inherit version; pname = "oelint_parser"; - hash = "sha256-knMxVBibaX3wK7VNBODHeLeAbBOXHKNbyxjItiNcIfw="; + hash = "sha256-AZkbLTMWSUfrbgXZzvKy+maNaB7AwLPoh3Q8QT4Zq5U="; }; buildInputs = [ pip ]; From 9e8f3a70da89fbaa85c083a107173de346ba9904 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Thu, 18 Apr 2024 20:46:52 +0200 Subject: [PATCH 49/89] python312Packages.editdistpy: drop support for python 3.6 Co-authored-by: Radik Islamov --- pkgs/development/python-modules/editdistpy/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/editdistpy/default.nix b/pkgs/development/python-modules/editdistpy/default.nix index 213f2d254dfc..0b47711674c4 100644 --- a/pkgs/development/python-modules/editdistpy/default.nix +++ b/pkgs/development/python-modules/editdistpy/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { version = "0.1.4"; pyproject = true; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "mammothb"; From a72a6ca435b9ca4c3d671633c6656172ed5e96d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 12 Apr 2024 01:57:42 +0000 Subject: [PATCH 50/89] synology-drive-client: 3.4.0-15724 -> 3.5.0-16084 --- .../networking/synology-drive-client/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index 84ca42cec167..f29d06af5985 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -2,7 +2,7 @@ let pname = "synology-drive-client"; baseUrl = "https://global.synologydownload.com/download/Utility/SynologyDriveClient"; - version = "3.4.0-15724"; + version = "3.5.0-16084"; buildNumber = with lib; last (splitString "-" version); meta = with lib; { description = "Desktop application to synchronize files and folders between the computer and the Synology Drive server."; @@ -30,7 +30,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Ubuntu/Installer/synology-drive-client-${buildNumber}.x86_64.deb"; - sha256 = "sha256-Zf6JMghXy8ODbR4MhVSPmD4QDu003MTc7YNfbiRVRoY="; + sha256 = "sha256-Spl6DC+wf+JaXjwH2ecraySo1VtA+EiI3/TWw9UOSA8="; }; nativeBuildInputs = [ autoPatchelfHook dpkg ]; @@ -60,7 +60,7 @@ let src = fetchurl { url = "${baseUrl}/${version}/Mac/Installer/synology-drive-client-${buildNumber}.dmg"; - sha256 = "sha256-65mZeRYHGl+n9TeTx7bxRrGPjcZiV9UlyfcCZ3GwOhE="; + sha256 = "sha256-NDYxUhWtAVUtpCf1WemqShZCFHGgLGwrkX6HldxOlH0="; }; nativeBuildInputs = [ cpio xar undmg ]; From 7b537b5b64ce03514d536e1486a72bbef47ad908 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Apr 2024 02:53:58 +0000 Subject: [PATCH 51/89] ugrep-indexer: 0.9.6 -> 1.0.0 --- pkgs/by-name/ug/ugrep-indexer/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ug/ugrep-indexer/package.nix b/pkgs/by-name/ug/ugrep-indexer/package.nix index 07bd5edac253..2dd2cde3a266 100644 --- a/pkgs/by-name/ug/ugrep-indexer/package.nix +++ b/pkgs/by-name/ug/ugrep-indexer/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "ugrep-indexer"; - version = "0.9.6"; + version = "1.0.0"; src = fetchFromGitHub { owner = "Genivia"; repo = "ugrep-indexer"; rev = "v${finalAttrs.version}"; - hash = "sha256-ZXZF9ZSdfQ2gxi5JkDJCUzMbkTs9KLzZBsyYxR/v4tI="; + hash = "sha256-XKjCAYPBRQgId66LupTlODPh2ctzvk7rHWznkLd4C8c="; }; buildInputs = [ From 894cdbfae08995647300e722c86425a4f5607003 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Apr 2024 02:56:24 +0000 Subject: [PATCH 52/89] sopwith: 2.4.0 -> 2.5.0 --- pkgs/by-name/so/sopwith/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/so/sopwith/package.nix b/pkgs/by-name/so/sopwith/package.nix index b881454fff78..8a4c1f916201 100644 --- a/pkgs/by-name/so/sopwith/package.nix +++ b/pkgs/by-name/so/sopwith/package.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "sopwith"; - version = "2.4.0"; + version = "2.5.0"; src = fetchFromGitHub { owner = "fragglet"; repo = "sdl-sopwith"; rev = "refs/tags/sdl-sopwith-${version}"; - hash = "sha256-7/xTg41NYxzeGNyt/ClbM/uHMTAE87wn6vc9Ai6P+30="; + hash = "sha256-e7/Cv/v5NhYG5eb9B5oVxh/Dbmm2v4Y4KUKI4JI5SFw="; }; nativeBuildInputs = [ From 4e215c8e3f56d6a1a1640e3314022f5aaadfe34b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Apr 2024 03:14:57 +0000 Subject: [PATCH 53/89] osv-scanner: 1.7.1 -> 1.7.2 --- pkgs/tools/security/osv-scanner/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index e51ce66ad024..00cc0dacc6ba 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -6,16 +6,16 @@ }: buildGoModule rec { pname = "osv-scanner"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "google"; repo = pname; rev = "v${version}"; - hash = "sha256-JlTD8el4hXVYI76+cxGNemkUu0n2QxCqisr6R9aPqdI="; + hash = "sha256-UE6iCvv/ByODZX+FoLvIw+EeyISWFkHb4xK5L33w1hU="; }; - vendorHash = "sha256-J5qLs4EirBOfjnLv8eQBSd9w9nzpxBW5GS28CgQMsN8="; + vendorHash = "sha256-c/Wjhpa7upSRMaU+rheGF9dbvK0MQe3ZmPLpR5bRiUI="; subPackages = [ "cmd/osv-scanner" From 1e4297075a9ce9733536e99683346c331b8631da Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 19 Apr 2024 14:35:09 +0200 Subject: [PATCH 54/89] osv-scanner: refactor --- pkgs/tools/security/osv-scanner/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/osv-scanner/default.nix b/pkgs/tools/security/osv-scanner/default.nix index 00cc0dacc6ba..70393cb9aad8 100644 --- a/pkgs/tools/security/osv-scanner/default.nix +++ b/pkgs/tools/security/osv-scanner/default.nix @@ -4,14 +4,15 @@ , testers , osv-scanner }: + buildGoModule rec { pname = "osv-scanner"; version = "1.7.2"; src = fetchFromGitHub { owner = "google"; - repo = pname; - rev = "v${version}"; + repo = "osv-scanner"; + rev = "refs/tags/v${version}"; hash = "sha256-UE6iCvv/ByODZX+FoLvIw+EeyISWFkHb4xK5L33w1hU="; }; @@ -24,9 +25,9 @@ buildGoModule rec { ldflags = [ "-s" "-w" - "-X github.com/google/osv-scanner/internal/version.OSVVersion=${version}" - "-X main.commit=n/a" - "-X main.date=1970-01-01T00:00:00Z" + "-X=github.com/google/osv-scanner/internal/version.OSVVersion=${version}" + "-X=main.commit=n/a" + "-X=main.date=1970-01-01T00:00:00Z" ]; # Tests require network connectivity to query https://api.osv.dev. From 0bd067ca39471cfec4ee11bd62cfbfe2f623e3ae Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 16 Apr 2024 08:08:29 -0300 Subject: [PATCH 55/89] earlyoom: migrate to by-name --- .../linux => by-name/ea}/earlyoom/fix-dbus-path.patch | 0 .../earlyoom/default.nix => by-name/ea/earlyoom/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 deletions(-) rename pkgs/{os-specific/linux => by-name/ea}/earlyoom/fix-dbus-path.patch (100%) rename pkgs/{os-specific/linux/earlyoom/default.nix => by-name/ea/earlyoom/package.nix} (100%) diff --git a/pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch b/pkgs/by-name/ea/earlyoom/fix-dbus-path.patch similarity index 100% rename from pkgs/os-specific/linux/earlyoom/fix-dbus-path.patch rename to pkgs/by-name/ea/earlyoom/fix-dbus-path.patch diff --git a/pkgs/os-specific/linux/earlyoom/default.nix b/pkgs/by-name/ea/earlyoom/package.nix similarity index 100% rename from pkgs/os-specific/linux/earlyoom/default.nix rename to pkgs/by-name/ea/earlyoom/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e13755dc7f04..5375529d44ee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5130,8 +5130,6 @@ with pkgs; earlybird = callPackage ../tools/security/earlybird { }; - earlyoom = callPackage ../os-specific/linux/earlyoom { }; - easyabc = callPackage ../applications/audio/easyabc { }; easycrypt = callPackage ../applications/science/logic/easycrypt { From 1b123a1cf340bb8bb3f1f63bbf59e9e528b3f004 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 16 Apr 2024 08:16:26 -0300 Subject: [PATCH 56/89] earlyoom: refactor and adopt - rewrite input argset - finalAttrs - split outputs - runHooks everywhere - get rid of nested with - meta.longDescription --- ...us-path.patch => 0000-fix-dbus-path.patch} | 0 pkgs/by-name/ea/earlyoom/package.nix | 54 ++++++++++++++----- 2 files changed, 40 insertions(+), 14 deletions(-) rename pkgs/by-name/ea/earlyoom/{fix-dbus-path.patch => 0000-fix-dbus-path.patch} (100%) diff --git a/pkgs/by-name/ea/earlyoom/fix-dbus-path.patch b/pkgs/by-name/ea/earlyoom/0000-fix-dbus-path.patch similarity index 100% rename from pkgs/by-name/ea/earlyoom/fix-dbus-path.patch rename to pkgs/by-name/ea/earlyoom/0000-fix-dbus-path.patch diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix index d1d95b4d3f95..c8cb744c3fcf 100644 --- a/pkgs/by-name/ea/earlyoom/package.nix +++ b/pkgs/by-name/ea/earlyoom/package.nix @@ -1,38 +1,64 @@ -{ lib, stdenv, fetchFromGitHub, pandoc, installShellFiles, withManpage ? false, nixosTests }: +{ + lib, + fetchFromGitHub, + installShellFiles, + pandoc, + stdenv, + nixosTests, + # Boolean flags + withManpage ? true, +}: -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "earlyoom"; version = "1.7"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; - rev = "v${version}"; - sha256 = "sha256-8YcT1TTlAet7F1U9Ginda4IApNqkudegOXqm8rnRGfc="; + rev = "v${finalAttrs.version}"; + hash = "sha256-8YcT1TTlAet7F1U9Ginda4IApNqkudegOXqm8rnRGfc="; }; - nativeBuildInputs = lib.optionals withManpage [ pandoc installShellFiles ]; + outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ]; - patches = [ ./fix-dbus-path.patch ]; + patches = [ ./0000-fix-dbus-path.patch ]; - makeFlags = [ "VERSION=${version}" ]; + nativeBuildInputs = lib.optionals withManpage [ + installShellFiles + pandoc + ]; + + makeFlags = [ + "VERSION=${finalAttrs.version}" + ]; installPhase = '' + runHook preInstall install -D earlyoom $out/bin/earlyoom '' + lib.optionalString withManpage '' installManPage earlyoom.1 + '' + '' + runHook postInstall ''; passthru.tests = { inherit (nixosTests) earlyoom; }; - meta = with lib; { - description = "Early OOM Daemon for Linux"; - mainProgram = "earlyoom"; + meta = { homepage = "https://github.com/rfjakob/earlyoom"; - license = licenses.mit; - platforms = platforms.linux; - maintainers = with maintainers; []; + description = "Early OOM Daemon for Linux"; + longDescription = '' + earlyoom checks the amount of available memory and free swap up to 10 + times a second (less often if there is a lot of free memory). By default + if both are below 10%, it will kill the largest process (highest + oom_score). The percentage value is configurable via command line + arguments. + ''; + license = lib.licenses.mit; + mainProgram = "earlyoom"; + maintainers = with lib.maintainers; [ AndersonTorres ]; + platforms = lib.platforms.linux; }; -} +}) From 7b7ccd525c8816f7b5d4c79cf6238ab767d00fd4 Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Apr 2024 09:48:49 -0300 Subject: [PATCH 57/89] nixosTests.earlyoom: add AndersonTorres as maintainer --- nixos/tests/earlyoom.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/earlyoom.nix b/nixos/tests/earlyoom.nix index 75bdf56899b3..b7850ddeaaab 100644 --- a/nixos/tests/earlyoom.nix +++ b/nixos/tests/earlyoom.nix @@ -1,7 +1,7 @@ import ./make-test-python.nix ({ lib, ... }: { name = "earlyoom"; meta = { - maintainers = with lib.maintainers; [ ncfavier ]; + maintainers = with lib.maintainers; [ ncfavier AndersonTorres ]; }; machine = { From cef01a232d3524c0fb73510492eeb13a61e5f24a Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Fri, 19 Apr 2024 09:49:37 -0300 Subject: [PATCH 58/89] services.earlyoom: set package option Also add AndersonTorres as maintainer. --- nixos/modules/services/system/earlyoom.nix | 39 ++++++++++++++-------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/nixos/modules/services/system/earlyoom.nix b/nixos/modules/services/system/earlyoom.nix index bcdf7d6512d5..7e012dee02cb 100644 --- a/nixos/modules/services/system/earlyoom.nix +++ b/nixos/modules/services/system/earlyoom.nix @@ -4,15 +4,29 @@ let cfg = config.services.earlyoom; inherit (lib) - mkDefault mkEnableOption mkIf mkOption types - mkRemovedOptionModule literalExpression - escapeShellArg concatStringsSep optional optionalString; - + concatStringsSep + escapeShellArg + literalExpression + mkDefault + mkEnableOption + mkIf + mkOption + mkPackageOption + mkRemovedOptionModule + optionalString + optionals + types; in { + meta = { + maintainers = with lib.maintainers; [ AndersonTorres ]; + }; + options.services.earlyoom = { enable = mkEnableOption "early out of memory killing"; + package = mkPackageOption pkgs "earlyoom" { }; + freeMemThreshold = mkOption { type = types.ints.between 1 100; default = 10; @@ -138,22 +152,21 @@ in systemd.services.earlyoom = { description = "Early OOM Daemon for Linux"; wantedBy = [ "multi-user.target" ]; - path = optional cfg.enableNotifications pkgs.dbus; + path = optionals cfg.enableNotifications [ pkgs.dbus ]; serviceConfig = { StandardError = "journal"; ExecStart = concatStringsSep " " ([ - "${pkgs.earlyoom}/bin/earlyoom" + "${lib.getExe cfg.package}" ("-m ${toString cfg.freeMemThreshold}" - + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}") + + optionalString (cfg.freeMemKillThreshold != null) ",${toString cfg.freeMemKillThreshold}") ("-s ${toString cfg.freeSwapThreshold}" - + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}") + + optionalString (cfg.freeSwapKillThreshold != null) ",${toString cfg.freeSwapKillThreshold}") "-r ${toString cfg.reportInterval}" ] - ++ optional cfg.enableDebugInfo "-d" - ++ optional cfg.enableNotifications "-n" - ++ optional (cfg.killHook != null) "-N ${escapeShellArg cfg.killHook}" - ++ cfg.extraArgs - ); + ++ optionals cfg.enableDebugInfo [ "-d" ] + ++ optionals cfg.enableNotifications [ "-n" ] + ++ optionals (cfg.killHook != null) [ "-N ${escapeShellArg cfg.killHook}" ] + ++ cfg.extraArgs); }; }; }; From d36daf07d634559459d15b17a26706cf59c7badb Mon Sep 17 00:00:00 2001 From: Anderson Torres Date: Tue, 16 Apr 2024 08:19:51 -0300 Subject: [PATCH 59/89] earlyoom: 1.7 -> 1.8 Co-authored-by: R. RyanTM --- pkgs/by-name/ea/earlyoom/package.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/ea/earlyoom/package.nix b/pkgs/by-name/ea/earlyoom/package.nix index c8cb744c3fcf..ba69b72b3bab 100644 --- a/pkgs/by-name/ea/earlyoom/package.nix +++ b/pkgs/by-name/ea/earlyoom/package.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "earlyoom"; - version = "1.7"; + version = "1.8"; src = fetchFromGitHub { owner = "rfjakob"; repo = "earlyoom"; rev = "v${finalAttrs.version}"; - hash = "sha256-8YcT1TTlAet7F1U9Ginda4IApNqkudegOXqm8rnRGfc="; + hash = "sha256-jgNoYOGor2i3ngDuU3It238n5ky+AppzlRKdkwXb2AI="; }; outputs = [ "out" ] ++ lib.optionals withManpage [ "man" ]; From 914394ec8112d260fc77d7ca3955b815ee6f1d3e Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 19 Apr 2024 17:50:06 +0200 Subject: [PATCH 60/89] signal-desktop: 7.4.0 -> 7.5.1 --- .../instant-messengers/signal-desktop/signal-desktop.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix index 0d4d46be06b4..130508f95e30 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop"; dir = "Signal"; - version = "7.4.0"; + version = "7.5.1"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - hash = "sha256-9a8Y8ncatynKspC/q0YxUWJj+nENr1ArwCZA9Ng8Mxk="; + hash = "sha256-afKR+P2YPkv4OMIr8LzWeAMZWr0zaJ1R0BQD87gQuSk="; } From e75f120d03e8d8761baf8745ef3bd5506b8b50cc Mon Sep 17 00:00:00 2001 From: Gliczy <129636582+Gliczy@users.noreply.github.com> Date: Fri, 19 Apr 2024 17:50:51 +0200 Subject: [PATCH 61/89] signal-desktop-beta: 7.4.0-beta.2 -> 7.6.0-beta.3 --- .../instant-messengers/signal-desktop/signal-desktop-beta.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix index 2e13a6637735..62b6e1c9a484 100644 --- a/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix +++ b/pkgs/applications/networking/instant-messengers/signal-desktop/signal-desktop-beta.nix @@ -2,7 +2,7 @@ callPackage ./generic.nix { } rec { pname = "signal-desktop-beta"; dir = "Signal Beta"; - version = "7.4.0-beta.2"; + version = "7.6.0-beta.3"; url = "https://updates.signal.org/desktop/apt/pool/s/signal-desktop-beta/signal-desktop-beta_${version}_amd64.deb"; - hash = "sha256-oBkZ9BaKbmosTkC/OZFjt6PmU/9XqclyzbllwYPj3Q4="; + hash = "sha256-BbXogNB2BxFQTpvHw0JVOaCV2PQHEQbafSavVcBd/Fg="; } From cba2c07976ecbd26d0d969c66c2bbe02ab9e6879 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 19 Apr 2024 21:16:41 +0000 Subject: [PATCH 62/89] changedetection-io: 0.45.17 -> 0.45.20 --- pkgs/servers/web-apps/changedetection-io/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/web-apps/changedetection-io/default.nix b/pkgs/servers/web-apps/changedetection-io/default.nix index 1d45e156096c..c3c9c8116add 100644 --- a/pkgs/servers/web-apps/changedetection-io/default.nix +++ b/pkgs/servers/web-apps/changedetection-io/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "changedetection-io"; - version = "0.45.17"; + version = "0.45.20"; format = "setuptools"; src = fetchFromGitHub { owner = "dgtlmoon"; repo = "changedetection.io"; - rev = version; - hash = "sha256-3LaNZourDjFjdSh5+hwc2l2DRMEI/rbfyksFD9uUebg="; + rev = "refs/tags/${version}"; + hash = "sha256-wnJz/yVOSBTgOfGxmrO4JXifZxoTk8bjqGKqKsbwXAI="; }; postPatch = '' From 5f934377b577cd70106b7935253d7c47b6feda49 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 04:46:49 +0000 Subject: [PATCH 63/89] linkerd_edge: 24.4.2 -> 24.4.4 --- pkgs/applications/networking/cluster/linkerd/edge.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/linkerd/edge.nix b/pkgs/applications/networking/cluster/linkerd/edge.nix index e268dadd262d..f40dc6247476 100644 --- a/pkgs/applications/networking/cluster/linkerd/edge.nix +++ b/pkgs/applications/networking/cluster/linkerd/edge.nix @@ -2,7 +2,7 @@ (callPackage ./generic.nix { }) { channel = "edge"; - version = "24.4.2"; - sha256 = "0apwhbcnghy7b9kwalbhcgvgcrwv6s55gzlgax55qaa5lxm6r6yz"; + version = "24.4.4"; + sha256 = "07p4cgl4myv7kv9pxvxrvsqnl3vkd9ay5hngx5g6xds2sc8va306"; vendorHash = "sha256-bLTummNoDfGMYvtfSLxICgCFZEymPJcRWkQyWOSzKR8="; } From d431aff11b0b5f026d33156268c5e381dfc5222b Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Sat, 20 Apr 2024 01:37:58 -0400 Subject: [PATCH 64/89] tkey-ssh-agent: init at 1.0.0 --- pkgs/by-name/tk/tkey-ssh-agent/package.nix | 27 ++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 pkgs/by-name/tk/tkey-ssh-agent/package.nix diff --git a/pkgs/by-name/tk/tkey-ssh-agent/package.nix b/pkgs/by-name/tk/tkey-ssh-agent/package.nix new file mode 100644 index 000000000000..3a38389ae4a9 --- /dev/null +++ b/pkgs/by-name/tk/tkey-ssh-agent/package.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "tkey-ssh-agent"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "tillitis"; + repo = "tkey-ssh-agent"; + rev = "v${version}"; + sha256 = "sha256-Uf3VJJfZn4UYX1q79JdaOfrore+L/Mic3whzpP32JV0="; + }; + + vendorHash = "sha256-SFyp1UB6+m7/YllRyY56SwweJ3X175bChXQYiG2M7zM="; + + subPackages = [ + "cmd/tkey-ssh-agent" + ]; + + meta = with lib; { + description = "SSH Agent for TKey, the flexible open hardware/software USB security key"; + homepage = "https://tillitis.se/app/tkey-ssh-agent/"; + license = licenses.gpl2; + maintainers = with maintainers; [ bbigras ]; + platforms = platforms.all; + }; +} From 63969d3a940c467d1548abf498b973a9379f8617 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Sat, 20 Apr 2024 08:37:53 +0000 Subject: [PATCH 65/89] goawk: 1.26.0 -> 1.27.0 --- pkgs/tools/text/goawk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/goawk/default.nix b/pkgs/tools/text/goawk/default.nix index 2ed24f93d4d7..4d84d133775e 100644 --- a/pkgs/tools/text/goawk/default.nix +++ b/pkgs/tools/text/goawk/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "goawk"; - version = "1.26.0"; + version = "1.27.0"; src = fetchFromGitHub { owner = "benhoyt"; repo = "goawk"; rev = "v${version}"; - hash = "sha256-EJf5Qv5ICJJdGNcRQ7v/ANyxx2j9d9NsZJnzIBrwam4="; + hash = "sha256-KB9N345xkgsPfI4DQYFag7qSdFv/JSU18YG8IPFrcQA="; }; vendorHash = null; From 2c817408905d7b32ee1cdf5a4aa0ec2b76b3b652 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 11:43:28 +0000 Subject: [PATCH 66/89] zfs-replicate: 3.2.12 -> 3.2.13 --- pkgs/tools/backup/zfs-replicate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/zfs-replicate/default.nix b/pkgs/tools/backup/zfs-replicate/default.nix index c5a4d2f0317f..1ae5c0de79fa 100644 --- a/pkgs/tools/backup/zfs-replicate/default.nix +++ b/pkgs/tools/backup/zfs-replicate/default.nix @@ -11,12 +11,12 @@ buildPythonApplication rec { pname = "zfs_replicate"; - version = "3.2.12"; + version = "3.2.13"; pyproject = true; src = fetchPypi { inherit pname version; - hash = "sha256-Pyn/ehXVb5knHS1A/MFTYE0t+IVgtBe1dAnYdaHutyk="; + hash = "sha256-Xmg33bqs3gQJWqkCNiWYUem3o6XsxpfbHIVvLs/2D94="; }; postPatch = '' From 9c42b802baa35dd030e3272d25695a80f2045009 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sat, 20 Apr 2024 13:44:58 +0200 Subject: [PATCH 67/89] podman-compose: 1.0.6 -> 1.1.0 --- .../virtualization/podman-compose/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/podman-compose/default.nix b/pkgs/applications/virtualization/podman-compose/default.nix index 8671617a4043..29bfbfa78189 100644 --- a/pkgs/applications/virtualization/podman-compose/default.nix +++ b/pkgs/applications/virtualization/podman-compose/default.nix @@ -1,17 +1,24 @@ -{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml }: +{ lib, buildPythonApplication, fetchFromGitHub, python-dotenv, pyyaml, setuptools, pipBuildHook, pypaBuildHook }: buildPythonApplication rec { - version = "1.0.6"; + version = "1.1.0"; pname = "podman-compose"; + pyproject = true; src = fetchFromGitHub { repo = "podman-compose"; owner = "containers"; rev = "v${version}"; - sha256 = "sha256-TsNM5xORqwWge+UCijKptwbAcIz1uZFN9BuIOl28vIU="; + sha256 = "sha256-uNgzdLrnDIABtt0L2pvsil14esRzl0XcWohgf7Oksr8="; }; - propagatedBuildInputs = [ pyyaml python-dotenv ]; + + build-system = [ + setuptools + ]; + + dependencies = [ python-dotenv pyyaml ]; + propagatedBuildInputs = [ pypaBuildHook ]; meta = { description = "An implementation of docker-compose with podman backend"; From 4e527ac342440fe234e549d792f7a4f343b90fd2 Mon Sep 17 00:00:00 2001 From: lunik1 Date: Sat, 20 Apr 2024 14:25:56 +0100 Subject: [PATCH 68/89] iosevka: 29.2.1 -> 29.2.1 Diff: https://github.com/be5invis/iosevka/compare/v29.2.1...v29.2.1 --- pkgs/data/fonts/iosevka/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix index ad8f2c0a8e02..1350b01d96fe 100644 --- a/pkgs/data/fonts/iosevka/default.nix +++ b/pkgs/data/fonts/iosevka/default.nix @@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null; buildNpmPackage rec { pname = "Iosevka${toString set}"; - version = "29.2.0"; + version = "29.2.1"; src = fetchFromGitHub { owner = "be5invis"; repo = "iosevka"; rev = "v${version}"; - hash = "sha256-7g0eogqiBdfTwg8btkHExrY4fpqf0hUZbvlElFtKrB8="; + hash = "sha256-WWumGi6+jaQUGi1eArS9l3G8sOQL4ZetixVB5RWDPQ4="; }; - npmDepsHash = "sha256-lSKh16qN4EAmC0wtBokkFyl6Vung85vPTyr8Icc4rU0="; + npmDepsHash = "sha256-Gm3R8lWmYbLOfyGW+f8CYXlodp11vMCMAhagILxLKFA="; nativeBuildInputs = [ remarshal From d2bc1006a686e51c3fcb9ecb65acaa5da80a5f83 Mon Sep 17 00:00:00 2001 From: Aleksana Date: Sat, 20 Apr 2024 21:32:41 +0800 Subject: [PATCH 69/89] synology-drive-client: add aarch64-darwin support --- pkgs/applications/networking/synology-drive-client/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/synology-drive-client/default.nix b/pkgs/applications/networking/synology-drive-client/default.nix index f29d06af5985..172e5bfb669a 100644 --- a/pkgs/applications/networking/synology-drive-client/default.nix +++ b/pkgs/applications/networking/synology-drive-client/default.nix @@ -10,7 +10,7 @@ let sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.unfree; maintainers = with maintainers; [ jcouyang MoritzBoehme ]; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; mainProgram = "synology-drive"; }; passthru.updateScript = writeScript "update-synology-drive-client" '' From e324e2ff82584ad43f6da104371cb4dca81b2f8a Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 20 Apr 2024 11:11:28 -0300 Subject: [PATCH 70/89] vscode-extensions: format using nixfmt-rfc-style Co-authored-by: @SebTM --- .../editors/vscode/extensions/default.nix | 217 ++++++++++-------- 1 file changed, 127 insertions(+), 90 deletions(-) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 5cf2b7b53d06..6b3b5e81fde4 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -1,27 +1,29 @@ # Before adding a new extension, read ./README.md -{ config -, lib -, fetchurl -, callPackage -, vscode-utils -, python3Packages -, jdk -, llvmPackages -, llvmPackages_14 -, protobuf -, jq -, moreutils -, autoPatchelfHook -, zlib -, stdenv +{ + autoPatchelfHook, + callPackage, + config, + fetchurl, + jdk, + jq, + lib, + llvmPackages, + llvmPackages_14, + moreutils, + protobuf, + python3Packages, + stdenv, + vscode-utils, + zlib, }: let inherit (vscode-utils) buildVscodeMarketplaceExtension; - baseExtensions = self: lib.mapAttrs (_n: lib.recurseIntoAttrs) - { + baseExtensions = + self: + lib.mapAttrs (_n: lib.recurseIntoAttrs) { "13xforever".language-x86-64-assembly = buildVscodeMarketplaceExtension { mktplcRef = { name = "language-x86-64-assembly"; @@ -316,8 +318,7 @@ let }; meta = { description = "An arctic, north-bluish clean and elegant Visual Studio Code theme."; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=arcticicestudio.nord-visual-studio-code"; homepage = "https://github.com/arcticicestudio/nord-visual-studio-code"; license = lib.licenses.mit; maintainers = [ lib.maintainers.imgabe ]; @@ -363,7 +364,7 @@ let homepage = "https://github.com/asdine/vscode-cue"; changelog = "https://marketplace.visualstudio.com/items/asdine.cue/changelog"; license = lib.licenses.mit; - maintainers = [lib.maintainers.matthewpi]; + maintainers = [ lib.maintainers.matthewpi ]; }; }; @@ -735,30 +736,33 @@ let }; charliermarsh.ruff = buildVscodeMarketplaceExtension { - mktplcRef = let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - hash = "sha256-2c0tH/MlDOqeyffcV8ZCy4woogBTcf1GCuPPO8JXaWc="; + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-2c0tH/MlDOqeyffcV8ZCy4woogBTcf1GCuPPO8JXaWc="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + hash = "sha256-euvGIlO7931N56R5BWKu3F9nSEoDgf+DXk7Hgl1qSUw="; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + hash = "sha256-dGpIHChnfrQbxRZDuoAi4imgStyyPdxdvTQ3lknMYu0="; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + hash = "sha256-tElX4C0I5AmpxSHMtqOsxSAUImD1tqArB5fnvhw4LFc="; + }; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - hash = "sha256-euvGIlO7931N56R5BWKu3F9nSEoDgf+DXk7Hgl1qSUw="; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - hash = "sha256-dGpIHChnfrQbxRZDuoAi4imgStyyPdxdvTQ3lknMYu0="; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - hash = "sha256-tElX4C0I5AmpxSHMtqOsxSAUImD1tqArB5fnvhw4LFc="; - }; - }; - in { - name = "ruff"; - publisher = "charliermarsh"; - version = "2024.4.0"; - } // sources.${stdenv.system} or (throw "Unsupported system ${stdenv.system}"); + in + { + name = "ruff"; + publisher = "charliermarsh"; + version = "2024.4.0"; + } + // sources.${stdenv.system} or (throw "Unsupported system ${stdenv.system}"); meta = { license = lib.licenses.mit; changelog = "https://marketplace.visualstudio.com/items/charliermarsh.ruff/changelog"; @@ -917,7 +921,9 @@ let }; }; - contextmapper.context-mapper-vscode-extension = callPackage ./contextmapper.context-mapper-vscode-extension { }; + contextmapper.context-mapper-vscode-extension = + callPackage ./contextmapper.context-mapper-vscode-extension + { }; continue.continue = buildVscodeMarketplaceExtension { mktplcRef = @@ -945,13 +951,10 @@ let name = "continue"; publisher = "Continue"; version = "0.8.22"; - } // sources.${stdenv.system}; - nativeBuildInputs = [ - autoPatchelfHook - ]; - buildInputs = [ - stdenv.cc.cc.lib - ]; + } + // sources.${stdenv.system}; + nativeBuildInputs = [ autoPatchelfHook ]; + buildInputs = [ stdenv.cc.cc.lib ]; postInstall = '' cd "$out/$installPrefix" substituteInPlace "out/extension.js" \ @@ -963,7 +966,12 @@ let homepage = "https://github.com/continuedev/continue"; license = lib.licenses.asl20; maintainers = [ lib.maintainers.raroh73 ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; }; }; @@ -1130,34 +1138,35 @@ let }; devsense.phptools-vscode = buildVscodeMarketplaceExtension { - mktplcRef = let - sources = { - "x86_64-linux" = { - arch = "linux-x64"; - hash = "sha256-8i5nRlzd+LnpEh9trWECxfiC1W4S0ekBab5vo18OlsA="; + mktplcRef = + let + sources = { + "x86_64-linux" = { + arch = "linux-x64"; + hash = "sha256-8i5nRlzd+LnpEh9trWECxfiC1W4S0ekBab5vo18OlsA="; + }; + "x86_64-darwin" = { + arch = "darwin-x64"; + sha256 = "14crw56277rdwhigabb3nsndkfcs3yzzf7gw85jvryxviq32chgy"; + }; + "aarch64-linux" = { + arch = "linux-arm64"; + sha256 = "1j1xlvbg3nrfmdd9zm6kywwicdwdkrq0si86lcndaii8m7sj5pfp"; + }; + "aarch64-darwin" = { + arch = "darwin-arm64"; + sha256 = "0nlks6iqxkx1xlicsa8lrb1319rgznlxkv2gg7wkwgzph97ik8bi"; + }; }; - "x86_64-darwin" = { - arch = "darwin-x64"; - sha256 = "14crw56277rdwhigabb3nsndkfcs3yzzf7gw85jvryxviq32chgy"; - }; - "aarch64-linux" = { - arch = "linux-arm64"; - sha256 = "1j1xlvbg3nrfmdd9zm6kywwicdwdkrq0si86lcndaii8m7sj5pfp"; - }; - "aarch64-darwin" = { - arch = "darwin-arm64"; - sha256 = "0nlks6iqxkx1xlicsa8lrb1319rgznlxkv2gg7wkwgzph97ik8bi"; - }; - }; - in { - name = "phptools-vscode"; - publisher = "devsense"; - version = "1.41.14332"; - } // sources.${stdenv.system}; + in + { + name = "phptools-vscode"; + publisher = "devsense"; + version = "1.41.14332"; + } + // sources.${stdenv.system}; - nativeBuildInputs = [ - autoPatchelfHook - ]; + nativeBuildInputs = [ autoPatchelfHook ]; buildInputs = [ zlib @@ -1175,7 +1184,12 @@ let homepage = "https://github.com/DEVSENSE/phptools-docs"; license = lib.licenses.unfree; maintainers = [ lib.maintainers.drupol ]; - platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" ]; + platforms = [ + "x86_64-linux" + "x86_64-darwin" + "aarch64-darwin" + "aarch64-linux" + ]; }; }; @@ -1203,7 +1217,9 @@ let version = "0.0.4"; sha256 = "0sa04srhqmngmw71slnrapi2xay0arj42j4gkan8i11n7bfi1xpf"; }; - meta = { license = lib.licenses.mit; }; + meta = { + license = lib.licenses.mit; + }; }; dhall.vscode-dhall-lsp-server = buildVscodeMarketplaceExtension { @@ -1213,7 +1229,9 @@ let version = "0.0.4"; sha256 = "1zin7s827bpf9yvzpxpr5n6mv0b5rhh3civsqzmj52mdq365d2js"; }; - meta = { license = lib.licenses.mit; }; + meta = { + license = lib.licenses.mit; + }; }; dhedgecock.radical-vscode = buildVscodeMarketplaceExtension { @@ -1240,7 +1258,9 @@ let version = "0.0.8"; hash = "sha256-BQPiSxiPPjdNPtIJI8L+558DVKxngPAI9sscpcJSJUI="; }; - meta = { license = lib.licenses.asl20; }; + meta = { + license = lib.licenses.asl20; + }; }; divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension { @@ -1794,8 +1814,7 @@ let }; meta = { description = "GitHub theme for VS Code"; - downloadPage = - "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=GitHub.github-vscode-theme"; homepage = "https://github.com/primer/github-vscode-theme"; license = lib.licenses.mit; maintainers = [ lib.maintainers.hugolgst ]; @@ -1830,7 +1849,9 @@ let version = "0.78.1"; hash = "sha256-T9oW6o4ItZfR8E1qrcH3nhMvVB6ihi4kpiDz7YGHOcI="; }; - meta = { license = lib.licenses.mit; }; + meta = { + license = lib.licenses.mit; + }; }; gitlab.gitlab-workflow = buildVscodeMarketplaceExtension { @@ -2439,9 +2460,15 @@ let hash = "sha256-IueXiN+077tiecAsVCzgYksWYTs00mZv6XJVMtRJ/PQ="; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; - buildInputs = [ cfn-lint pydot ]; + buildInputs = [ + cfn-lint + pydot + ]; postInstall = '' cd "$out/$installPrefix" @@ -4179,7 +4206,11 @@ let downloadPage = "https://marketplace.visualstudio.com/items?itemName=uiua-lang.uiua-vscode"; homepage = "https://github.com/uiua-lang/uiua-vscode"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ tomasajt wackbyte defelo ]; + maintainers = with lib.maintainers; [ + tomasajt + wackbyte + defelo + ]; }; }; @@ -4249,7 +4280,10 @@ let sha256 = "1nlrijjwc35n1xgb5lgnr4yvlgfcxd0vdj93ip8lv2xi8x1ni5f6"; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; buildInputs = [ jdk ]; @@ -4693,7 +4727,10 @@ let version = "0.5.4"; sha256 = "08dfl5h1k6s542qw5qx2czm1wb37ck9w2vpjz44kp2az352nmksb"; }; - nativeBuildInputs = [ jq moreutils ]; + nativeBuildInputs = [ + jq + moreutils + ]; postInstall = '' cd "$out/$installPrefix" jq '.contributes.configuration.properties.protoc.properties.path.default = "${protobuf}/bin/protoc"' package.json | sponge package.json From 4b116b8ff393d8c04c76f068564886700f3f8157 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:33:24 +0200 Subject: [PATCH 71/89] ockam: fix hash, cleanup --- pkgs/tools/networking/ockam/default.nix | 27 ++++--------------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/networking/ockam/default.nix b/pkgs/tools/networking/ockam/default.nix index 2d477923dde8..c191efbff6e1 100644 --- a/pkgs/tools/networking/ockam/default.nix +++ b/pkgs/tools/networking/ockam/default.nix @@ -7,6 +7,7 @@ , pkg-config , openssl , dbus +, AppKit , Security }: @@ -21,43 +22,23 @@ rustPlatform.buildRustPackage { owner = "build-trust"; repo = pname; rev = "ockam_v${version}"; - hash = "sha256-qHvgqK8K6F69m511VbNcSNFVe/tKpf8uonsBIOz3uKA="; + hash = "sha256-WXkprfA7DY3ZKCtTkVYMqYxyhLbfXPbXhYd0Oj5mJ+w="; }; - cargoHash = "sha256-1MCiC808VNg5SoHxomJ9WWJ1Pj0IrLky6nshHfK2Fpg="; + cargoHash = "sha256-TLNV+6n9J9rhf8Lck0HK+ZNPDDh8C+M+MLbIWBS8cO0="; nativeBuildInputs = [ git pkg-config ]; buildInputs = [ openssl dbus ] - ++ lib.optionals stdenv.isDarwin [ Security ]; + ++ lib.optionals stdenv.isDarwin [ AppKit Security ]; passthru.updateScript = nix-update-script { }; # too many tests fail for now doCheck = false; - # checkFlags = [ - # # tries to make a network access - # "--skip=tests::curl_http_ockam" - # "--skip=medium_file_transfer" - # "--skip=medium_file_transfer_large_chunks" - # "--skip=medium_file_transfer_small_chunks" - # "--skip=tiny_file_transfer" - # "--skip=tiny_file_transfer_small_chunks" - # # tries to do IO - # "--skip=cli_state::tests::integration" - # "--skip=cli_state::tests::test_create_default_identity_state" - # "--skip=cli_state::tests::test_create_named_identity_state" - # "--skip=kafka::integration_test::test::producer__flow_with_mock_kafka__content_encryption_and_decryption" - # "--skip=kafka::portal_worker::test::kafka_portal_worker__metadata_exchange__response_changed" - # "--skip=full_flow" - # "--skip=run::parser::tests::detect_circular_dependency" - # "--skip=run::parser::tests::test_parse_config_with_depends_on" - # "--skip=util::tests::test_process_multi_addr" - # ]; meta = with lib; { description = "Orchestrate end-to-end encryption, cryptographic identities, mutual authentication, and authorization policies between distributed applications – at massive scale"; homepage = "https://github.com/build-trust/ockam"; license = licenses.mpl20; maintainers = with maintainers; [ happysalada ]; - platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 693f6e5ff161..3b047f823bd6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6091,7 +6091,7 @@ with pkgs; ockam = callPackage ../tools/networking/ockam { - inherit (darwin.apple_sdk.frameworks) Security; + inherit (darwin.apple_sdk.frameworks) AppKit Security; }; odoo = callPackage ../applications/finance/odoo { }; From ac01eef7b19a8bdd22ef72ce4762bb0bf4e053a5 Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 20 Apr 2024 17:36:14 +0200 Subject: [PATCH 72/89] v8: unpin llvmPackages_15.stdenv on darwin --- pkgs/development/libraries/v8/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 13 +++---------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 37cc66834462..0eb3bda4286d 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -113,7 +113,7 @@ stdenv.mkDerivation rec { --replace 'current_toolchain == host_toolchain || !use_xcode_clang' \ 'false' ''} - ${lib.optionalString (stdenv.isDarwin && stdenv.isx86_64) '' + ${lib.optionalString stdenv.isDarwin '' substituteInPlace build/config/compiler/BUILD.gn \ --replace "-Wl,-fatal_warnings" "" ''} @@ -143,7 +143,11 @@ stdenv.mkDerivation rec { ] ++ lib.optional stdenv.cc.isClang ''clang_base_path="${llvmCcAndBintools}"'' ++ lib.optional stdenv.isDarwin ''use_lld=false''; - env.NIX_CFLAGS_COMPILE = "-O2"; + env.NIX_CFLAGS_COMPILE = toString ([ + "-O2" + ] ++ lib.optionals stdenv.cc.isClang [ + "-Wno-error=enum-constexpr-conversion" + ]); FORCE_MAC_SDK_MIN = stdenv.hostPlatform.sdkVer or "10.12"; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 693f6e5ff161..3e85bf8b26e3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24913,16 +24913,9 @@ with pkgs; ucommon = callPackage ../development/libraries/ucommon { }; - v8 = callPackage ../development/libraries/v8 ( - let - stdenv' = if stdenv.cc.isClang && lib.versionAtLeast (lib.getVersion stdenv.cc.cc) "16" - then overrideLibcxx llvmPackages_15.stdenv - else stdenv; - in - { - stdenv = if stdenv'.isDarwin then overrideSDK stdenv' "11.0" else stdenv'; - } - ); + v8 = callPackage ../development/libraries/v8 { + stdenv = if stdenv.isDarwin then overrideSDK stdenv "11.0" else stdenv; + }; intel-vaapi-driver = callPackage ../development/libraries/intel-vaapi-driver { }; From f94aaf8483cb2c8424263dfd4bad68b077bf94bf Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Sat, 20 Apr 2024 18:01:15 +0200 Subject: [PATCH 73/89] trust-dns: fix hash --- pkgs/servers/dns/trust-dns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/trust-dns/default.nix b/pkgs/servers/dns/trust-dns/default.nix index f33008189385..fa8fcc88261a 100644 --- a/pkgs/servers/dns/trust-dns/default.nix +++ b/pkgs/servers/dns/trust-dns/default.nix @@ -13,9 +13,9 @@ rustPlatform.buildRustPackage rec { owner = "hickory-dns"; repo = "hickory-dns"; rev = "v${version}"; - hash = "sha256-+vZnozPsORe7nK6jL/yt/wp2qjwBTqyxZYz+cXaKNFk="; + hash = "sha256-szq21RuRmkhAfHlzhGQYpwjiIRkavFCPETOt+6TxhP4="; }; - cargoHash = "sha256-VLpl6eMOstD0FsuPeHngKQitv1jcb+0dx2pc8ic3Cf4="; + cargoHash = "sha256-zGn5vHwsHgpkgOr30QiyScqnfXjH55LQIVtxoUUox64="; buildInputs = [ openssl ]; nativeBuildInputs = [ pkg-config ]; From ff8eddacb1617625ccf5d7f10a1e1b606e8161df Mon Sep 17 00:00:00 2001 From: raspher Date: Mon, 22 Jan 2024 10:00:24 +0100 Subject: [PATCH 74/89] biglybt: init at 3.5.0.0 Co-authored-by: superherointj <5861043+superherointj@users.noreply.github.com> --- pkgs/by-name/bi/biglybt/package.nix | 66 +++++++++++++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 pkgs/by-name/bi/biglybt/package.nix diff --git a/pkgs/by-name/bi/biglybt/package.nix b/pkgs/by-name/bi/biglybt/package.nix new file mode 100644 index 000000000000..ad365c14377a --- /dev/null +++ b/pkgs/by-name/bi/biglybt/package.nix @@ -0,0 +1,66 @@ +{ + lib, + stdenv, + fetchurl, + jre, + wrapGAppsHook, + nix-update-script, +}: + +stdenv.mkDerivation rec { + pname = "biglybt"; + version = "3.5.0.0"; + + src = fetchurl { + url = "https://github.com/BiglySoftware/BiglyBT/releases/download/v${version}/GitHub_BiglyBT_unix.tar.gz"; + hash = "sha256-ToTCIjunj/ABi3wVSmeddLGBdQlv+CfK2jGRjixJd0w="; + }; + + nativeBuildInputs = [ wrapGAppsHook ]; + + configurePhase = '' + runHook preConfigure + + sed -e 's/AUTOUPDATE_SCRIPT=1/AUTOUPDATE_SCRIPT=0/g' \ + -i biglybt || die + + runHook postConfigure + ''; + + installPhase = '' + runHook preInstall + + install -d $out/{share/{biglybt,applications,icons/hicolor/scalable/apps},bin} + + cp -r ./* $out/share/biglybt/ + + ln -s $out/share/biglybt/biglybt.desktop $out/share/applications/ + + ln -s $out/share/biglybt/biglybt.svg $out/share/icons/hicolor/scalable/apps/ + + wrapProgram $out/share/biglybt/biglybt \ + --prefix PATH : ${lib.makeBinPath [ jre ]} + + ln -s $out/share/biglybt/biglybt $out/bin/ + runHook postInstall + ''; + + passthru.updateScript = nix-update-script { + extraArgs = [ + "--version-regex" + "^(v[0-9.]+)$" + ]; + }; + + meta = { + changelog = "https://github.com/BiglySoftware/BiglyBT/releases/tag/v${version}"; + description = "A BitTorrent client based on the Azureus that supports I2P darknet for privacy"; + downloadPage = "https://github.com/BiglySoftware/BiglyBT"; + homepage = "https://www.biglybt.com/"; + license = lib.licenses.gpl3Plus; + platforms = lib.platforms.unix; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; + mainProgram = "biglybt"; + maintainers = with lib.maintainers; [ raspher ]; + }; +} From d9feb2e9baba5bc136e348c2cc3a80d97eb6726c Mon Sep 17 00:00:00 2001 From: Daniel Kempkens Date: Sat, 20 Apr 2024 19:39:54 +0200 Subject: [PATCH 75/89] podman: fix darwin support --- pkgs/applications/virtualization/podman/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/podman/default.nix b/pkgs/applications/virtualization/podman/default.nix index dca7b9bc4af0..92935ed129d8 100644 --- a/pkgs/applications/virtualization/podman/default.nix +++ b/pkgs/applications/virtualization/podman/default.nix @@ -74,13 +74,13 @@ buildGoModule rec { }; patches = [ + # we intentionally don't build and install the helper so we shouldn't display messages to users about it + ./rm-podman-mac-helper-msg.patch + ] ++ lib.optionals stdenv.isLinux [ (substituteAll { src = ./hardcode-paths.patch; inherit crun runc gvisor youki conmon; }) - - # we intentionally don't build and install the helper so we shouldn't display messages to users about it - ./rm-podman-mac-helper-msg.patch ]; vendorHash = null; From f22481048d64837f0ea85d607da711648d2e4e3b Mon Sep 17 00:00:00 2001 From: sodiboo Date: Sat, 20 Apr 2024 19:40:39 +0200 Subject: [PATCH 76/89] niri: 0.1.4 -> 0.1.5 --- pkgs/by-name/ni/niri/Cargo.lock | 13 +++++++------ pkgs/by-name/ni/niri/package.nix | 6 +++--- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/by-name/ni/niri/Cargo.lock b/pkgs/by-name/ni/niri/Cargo.lock index 8292783edb7d..eed1cf8108d9 100644 --- a/pkgs/by-name/ni/niri/Cargo.lock +++ b/pkgs/by-name/ni/niri/Cargo.lock @@ -2138,7 +2138,7 @@ dependencies = [ [[package]] name = "niri" -version = "0.1.4" +version = "0.1.5" dependencies = [ "anyhow", "arrayvec", @@ -2183,7 +2183,7 @@ dependencies = [ [[package]] name = "niri-config" -version = "0.1.4" +version = "0.1.5" dependencies = [ "bitflags 2.5.0", "csscolorparser", @@ -2198,15 +2198,16 @@ dependencies = [ [[package]] name = "niri-ipc" -version = "0.1.4" +version = "0.1.5" dependencies = [ "clap", "serde", + "serde_json", ] [[package]] name = "niri-visual-tests" -version = "0.1.4" +version = "0.1.5" dependencies = [ "anyhow", "gtk4", @@ -3115,7 +3116,7 @@ checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" [[package]] name = "smithay" version = "0.3.0" -source = "git+https://github.com/Smithay/smithay.git#e5f006818df7ebb92d206985f45e713ba1e9c1c9" +source = "git+https://github.com/Smithay/smithay.git#c5e9a697e41f50dc56b918d9ef1e3d2e52c84ac0" dependencies = [ "appendlist", "bitflags 2.5.0", @@ -3187,7 +3188,7 @@ dependencies = [ [[package]] name = "smithay-drm-extras" version = "0.1.0" -source = "git+https://github.com/Smithay/smithay.git#e5f006818df7ebb92d206985f45e713ba1e9c1c9" +source = "git+https://github.com/Smithay/smithay.git#c5e9a697e41f50dc56b918d9ef1e3d2e52c84ac0" dependencies = [ "drm", "edid-rs", diff --git a/pkgs/by-name/ni/niri/package.nix b/pkgs/by-name/ni/niri/package.nix index a24619921e52..8413089ece20 100644 --- a/pkgs/by-name/ni/niri/package.nix +++ b/pkgs/by-name/ni/niri/package.nix @@ -20,19 +20,19 @@ rustPlatform.buildRustPackage rec { pname = "niri"; - version = "0.1.4"; + version = "0.1.5"; src = fetchFromGitHub { owner = "YaLTeR"; repo = "niri"; rev = "v${version}"; - hash = "sha256-lkGIQIMWfg71UOkT/TST8O6hD0IfslENj6oFPevUGl4="; + hash = "sha256-YuYowUw5ecPa78bhT72zY2b99wn68mO3vVkop8hnb8M="; }; cargoLock = { lockFile = ./Cargo.lock; outputHashes = { - "smithay-0.3.0" = "sha256-bWan2DCyMvEC8ZQPwM+XpuOGkOZ/RdDV+LmRCN8UAuc="; + "smithay-0.3.0" = "sha256-1ANERwRG7Uwe1gSm6zQnEMQlpRrGSFP8mp6JItzjz0k="; }; }; From 605be9e6dafc8170a940255b6ab740f1b27c7177 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 17:54:51 +0000 Subject: [PATCH 77/89] mystmd: 1.1.53 -> 1.1.55 --- pkgs/by-name/my/mystmd/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/my/mystmd/package.nix b/pkgs/by-name/my/mystmd/package.nix index 6c4277ee5823..2be16bb1c83e 100644 --- a/pkgs/by-name/my/mystmd/package.nix +++ b/pkgs/by-name/my/mystmd/package.nix @@ -2,16 +2,16 @@ buildNpmPackage rec { pname = "mystmd"; - version = "1.1.53"; + version = "1.1.55"; src = fetchFromGitHub { owner = "executablebooks"; repo = "mystmd"; rev = "mystmd@${version}"; - hash = "sha256-neJKlUk0NHdAh7y92Iyv2kouASPzv1PIl79+D0mgckI="; + hash = "sha256-aIqIcNXlzpvW90WJs9tJajXvnEQB0IiNCu8B62cwElo="; }; - npmDepsHash = "sha256-bXvOzx89MR7KL9wsqzB1uorjGGjh++mw17Ni65LLz28="; + npmDepsHash = "sha256-QIGqx1Peogmdo1KLHkzUKqvAuA6jCJRfxeQ1X7p6vTM="; dontNpmInstall = true; From 55ddcaf70d70bf287a916624db2bbb5bb41c011a Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 12:57:48 -0700 Subject: [PATCH 78/89] avrdude: use either vendored libelf or elfutils instead of abandoned upstream --- pkgs/development/embedded/avrdude/default.nix | 26 ++++++++++++-- pkgs/development/embedded/avrdude/libelf.nix | 36 +++++++++++++++++++ 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/embedded/avrdude/libelf.nix diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index f03efa1dc820..b3d6d25f4502 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, libelf +{ lib, callPackage, stdenv, fetchFromGitHub, cmake, bison, flex, libusb1, elfutils , libftdi1, readline, hidapi, libserialport # Documentation building doesn't work on Darwin. It fails with: # Undefined subroutine &Locale::Messages::dgettext called in ... texi2html @@ -6,6 +6,10 @@ # https://github.com/NixOS/nixpkgs/issues/224761 , docSupport ? (!stdenv.hostPlatform.isDarwin), texliveMedium, texinfo, texi2html, unixtools }: +let + useElfutils = lib.meta.availableOn stdenv.hostPlatform elfutils; +in + stdenv.mkDerivation rec { pname = "avrdude"; version = "7.3"; @@ -24,7 +28,19 @@ stdenv.mkDerivation rec { texi2html ]; - buildInputs = [ hidapi libusb1 libelf libftdi1 libserialport readline ]; + buildInputs = [ + (if useElfutils then elfutils else finalAttrs.finalPackage.passthru.libelf) + hidapi + libusb1 + libftdi1 + libserialport + readline + ]; + + postPatch = lib.optionalString (!useElfutils) '' + # vendored libelf is a static library + sed -i "s/PREFERRED_LIBELF elf/PREFERRED_LIBELF libelf.a elf/" CMakeLists.txt + ''; # Not used: # @@ -39,6 +55,12 @@ stdenv.mkDerivation rec { rm $out/share/doc/${pname}/*.ps ''; + passthru = { + # Vendored and mutated copy of libelf for avrdudes use. + # Produces a static library only. + libelf = callPackage ./libelf.nix { }; + }; + meta = with lib; { description = "Command-line tool for programming Atmel AVR microcontrollers"; mainProgram = "avrdude"; diff --git a/pkgs/development/embedded/avrdude/libelf.nix b/pkgs/development/embedded/avrdude/libelf.nix new file mode 100644 index 000000000000..bd7b7be7066a --- /dev/null +++ b/pkgs/development/embedded/avrdude/libelf.nix @@ -0,0 +1,36 @@ +{ + lib, + stdenv, + cmake, + fetchFromGitHub, +}: + +stdenv.mkDerivation { + pname = "libelf"; + version = "0.8.13-unstable-2023-01-14"; + + src = fetchFromGitHub { + owner = "avrdudes"; + repo = "libelf"; + rev = "0c55bfe1d3020a20bddf6ce57c0d9d98ccb12586"; + hash = "sha256-jz7Ef0Eg673IJVZvVNklY40s13LCuMVAc7FGrRI7scQ="; + }; + + nativeBuildInputs = [ cmake ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/lib + cp liblibelf.a $out/lib/libelf.a + cp -r $src/include $out/include + runHook postInstall + ''; + + meta = { + description = "ELF object file access library (vendored by avrdudes)"; + homepage = "https://github.com/avrdudes/libelf"; + license = lib.licenses.lgpl2Plus; + platforms = lib.platforms.all; + maintainers = [ lib.maintainers.bjornfor ]; + }; +} From 07b7ca8345611c1e46fde38ae40397737e4695d7 Mon Sep 17 00:00:00 2001 From: Philip Taron Date: Thu, 11 Apr 2024 12:59:01 -0700 Subject: [PATCH 79/89] avrdude: use finalAttrs instead of rec --- pkgs/development/embedded/avrdude/default.nix | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/pkgs/development/embedded/avrdude/default.nix b/pkgs/development/embedded/avrdude/default.nix index b3d6d25f4502..41b6c5ffc940 100644 --- a/pkgs/development/embedded/avrdude/default.nix +++ b/pkgs/development/embedded/avrdude/default.nix @@ -10,14 +10,14 @@ let useElfutils = lib.meta.availableOn stdenv.hostPlatform elfutils; in -stdenv.mkDerivation rec { +stdenv.mkDerivation (finalAttrs: { pname = "avrdude"; version = "7.3"; src = fetchFromGitHub { owner = "avrdudes"; - repo = pname; - rev = "v${version}"; + repo = "avdude"; + rev = "v${finalAttrs.version}"; sha256 = "sha256-JqW3AOMmAfcy+PQRcqviWlxA6GoMSEfzIFt1pRYY7Dw="; }; @@ -43,16 +43,13 @@ stdenv.mkDerivation rec { ''; # Not used: - # # -DHAVE_LINUXGPIO=ON because it's incompatible with libgpiod 2.x - # - cmakeFlags = [ ] - ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" "-DHAVE_PARPORT=ON" ] - ++ lib.optionals docSupport [ "-DBUILD_DOC=ON" ]; + cmakeFlags = lib.optionals docSupport [ "-DBUILD_DOC=ON" ] + ++ lib.optionals stdenv.hostPlatform.isLinux [ "-DHAVE_LINUXSPI=ON" "-DHAVE_PARPORT=ON" ]; # dvips output references texlive in comments, resulting in a huge closure postInstall = lib.optionalString docSupport '' - rm $out/share/doc/${pname}/*.ps + rm $out/share/doc/avrdude/*.ps ''; passthru = { @@ -74,4 +71,4 @@ stdenv.mkDerivation rec { platforms = with platforms; linux ++ darwin; maintainers = [ maintainers.bjornfor ]; }; -} +}) From c7ab550bbc7fede3c00b20392ad712d3daee5acb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 18 Apr 2024 19:15:49 +0200 Subject: [PATCH 80/89] nixos/deconz: fix curl redirect option in postStart It should be curl -L (follow redirects), not curl -l (FTP directory listing option). I know because it's my mistake. Fixes: d4b989cafc77 ("nixos/deconz: delay signalling service readiness until it's actually up") --- nixos/modules/services/networking/deconz.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/deconz.nix b/nixos/modules/services/networking/deconz.nix index eaa7759d0407..88b0ee612d87 100644 --- a/nixos/modules/services/networking/deconz.nix +++ b/nixos/modules/services/networking/deconz.nix @@ -95,7 +95,7 @@ in ''; postStart = '' # Delay signalling service readiness until it's actually up. - while ! "${lib.getExe pkgs.curl}" -sSfl -o /dev/null "http://${cfg.listenAddress}:${toString cfg.httpPort}"; do + while ! "${lib.getExe pkgs.curl}" -sSfL -o /dev/null "http://${cfg.listenAddress}:${toString cfg.httpPort}"; do echo "Waiting for TCP port ${toString cfg.httpPort} to be open..." sleep 1 done From 0f5cb6b70294c52e643d0ca099b35308563a2674 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 16 Apr 2024 18:52:41 +0200 Subject: [PATCH 81/89] deconz: 2.23.00 -> 2.26.3 Upstream doesn't produce the *-dev package anymore, so remove it. (Apparently it's possible to get back the header files by building from source: https://github.com/dresden-elektronik/deconz-rest-plugin/blob/v2.26.3/BUILDING.md#build-with-cmake.) --- pkgs/servers/deconz/default.nix | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/pkgs/servers/deconz/default.nix b/pkgs/servers/deconz/default.nix index 7f5d60b153f8..110048f9de28 100644 --- a/pkgs/servers/deconz/default.nix +++ b/pkgs/servers/deconz/default.nix @@ -16,16 +16,11 @@ stdenv.mkDerivation rec { pname = "deconz"; - version = "2.23.00"; + version = "2.26.3"; src = fetchurl { url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-${version}-qt5.deb"; - sha256 = "sha256-TMftm1fz8c8ndSyA3HUd7JWT0DINxvbdUSDrmVMwmws="; - }; - - devsrc = fetchurl { - url = "https://deconz.dresden-elektronik.de/ubuntu/beta/deconz-dev-${version}.deb"; - sha256 = "sha256-uW5iF3rvFlowFhMBVDTOHkJ2K4LBgAxxC79tXpMhy5U="; + sha256 = "sha256-BE/apFPutNdhlS1NWRHdVcVrt/16aFfZ6zRcjphIlZA="; }; nativeBuildInputs = [ dpkg autoPatchelfHook makeWrapper wrapQtAppsHook ]; @@ -36,7 +31,6 @@ stdenv.mkDerivation rec { runHook preUnpack dpkg -x $src ./deconz-src - dpkg -x $devsrc ./deconz-devsrc runHook postUnpack ''; @@ -46,7 +40,6 @@ stdenv.mkDerivation rec { mkdir -p "$out" cp -r deconz-src/* "$out" - cp -r deconz-devsrc/* "$out" # Flatten /usr and manually merge lib/ and usr/lib/, since mv refuses to. mv "$out/lib" "$out/orig_lib" From c64f61e478b237f2f903d9e2596baa67cfa19ad9 Mon Sep 17 00:00:00 2001 From: Charlie Moog Date: Sat, 20 Apr 2024 16:33:05 +0000 Subject: [PATCH 82/89] systemctl-tui: 0.2.4 -> 0.3.3 --- pkgs/by-name/sy/systemctl-tui/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/sy/systemctl-tui/package.nix b/pkgs/by-name/sy/systemctl-tui/package.nix index 571c9b15091f..23a831e9e9c5 100644 --- a/pkgs/by-name/sy/systemctl-tui/package.nix +++ b/pkgs/by-name/sy/systemctl-tui/package.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "systemctl-tui"; - version = "0.2.4"; + version = "0.3.3"; src = fetchCrate { inherit pname version; - hash = "sha256-SZmOCx9S5WWz9fSlicvT/glZKj5AsFDRnxmHbGxM9Ms="; + hash = "sha256-oFXLxWS2G+CkG0yuJLkA34SqoGGcXU/eZmFMRYw+Gzo="; }; - cargoHash = "sha256-zUc6RchoGtJB+gnJNwNu93to775fdM5JDJ4qYwRdJn0="; + cargoHash = "sha256-MKxeRQupgAxA2ui8qSK8BvhxqqgjJarD8pY9wmk8MvA="; buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.AppKit From 9b45c0c6593f37ef3899a3ceaacf1e3df4556d1e Mon Sep 17 00:00:00 2001 From: Cole Helbling Date: Sat, 20 Apr 2024 12:31:29 -0700 Subject: [PATCH 83/89] Revert "ovftool: init at 4.6.2 for x86_64-darwin" --- pkgs/tools/virtualization/ovftool/default.nix | 331 ++++++------------ 1 file changed, 107 insertions(+), 224 deletions(-) diff --git a/pkgs/tools/virtualization/ovftool/default.nix b/pkgs/tools/virtualization/ovftool/default.nix index 76df36a1288a..9bdf4429ff16 100644 --- a/pkgs/tools/virtualization/ovftool/default.nix +++ b/pkgs/tools/virtualization/ovftool/default.nix @@ -1,267 +1,150 @@ -{ autoPatchelfHook -, c-ares -, darwin -, expat -, fetchurl -, glibc -, icu60 -, lib -, libiconv -, libredirect -, libxcrypt-legacy -, libxml2 -, makeWrapper -, stdenv -, unzip -, xercesc -, zlib +{ lib, stdenv, fetchurl, system ? builtins.currentSystem, ovftoolBundles ? {} +, autoPatchelfHook, makeWrapper, unzip +, glibc, c-ares, libxcrypt-legacy, expat, icu60, xercesc, zlib }: let + version = "4.6.2-22220919"; + version_i686 = "4.6.0-21452615"; - ovftoolSystems = - let - baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public"; - in - { - "i686-linux" = rec { - name = "VMware-ovftool-${version}-lin.i386.zip"; - # As of 2024-02-20 the "Zip of OVF Tool for 32-bit Linux" download link - # on the v4.6.2 page links to v4.6.0. - version = "4.6.0-21452615"; - url = "${baseUrl}/7254abb2-434d-4f5d-83e2-9311ced9752e/57e666a2-874c-48fe-b1d2-4b6381f7fe97/${name}"; - hash = "sha256-qEOr/3SW643G5ZQQNJTelZbUxB8HmxPd5uD+Gqsoxz0="; - }; - "x86_64-linux" = rec { - name = "VMware-ovftool-${version}-lin.x86_64.zip"; - version = "4.6.2-22220919"; - url = "${baseUrl}/8a93ce23-4f88-4ae8-b067-ae174291e98f/c609234d-59f2-4758-a113-0ec5bbe4b120/${name}"; - hash = "sha256-3B1cUDldoTqLsbSARj2abM65nv+Ot0z/Fa35/klJXEY="; - }; - "x86_64-darwin" = rec { - name = "VMware-ovftool-${version}-mac.x64.zip"; - version = "4.6.2-22220919"; - url = "${baseUrl}/91091b23-280a-487a-a048-0c2594303c92/dc666e23-104f-4b9b-be11-6d88dcf3ab98/${name}"; - hash = "sha256-AZufZ0wxt5DYjnpahDfy36W8i7kjIfEkW6MoELSx11k="; - }; + ovftoolZipUnpackPhase = '' + runHook preUnpack + unzip ${ovftoolSource} + extracted=ovftool/ + if [ -d "$extracted" ]; then + echo "ovftool extracted successfully" >&2 + else + echo "Could not find $extracted - are you sure this is ovftool?" >&2 + exit 1 + fi + runHook postUnpack + ''; + + ovftoolSystems = let + baseUrl = "https://vdc-download.vmware.com/vmwb-repository/dcr-public"; + in { + "i686-linux" = rec { + name = "VMware-ovftool-${version_i686}-lin.i386.zip"; + url = "${baseUrl}/7254abb2-434d-4f5d-83e2-9311ced9752e/57e666a2-874c-48fe-b1d2-4b6381f7fe97/${name}"; + hash = "sha256-qEOr/3SW643G5ZQQNJTelZbUxB8HmxPd5uD+Gqsoxz0="; + unpackPhase = ovftoolZipUnpackPhase; + }; + "x86_64-linux" = rec { + name = "VMware-ovftool-${version}-lin.x86_64.zip"; + url = "${baseUrl}/8a93ce23-4f88-4ae8-b067-ae174291e98f/c609234d-59f2-4758-a113-0ec5bbe4b120/${name}"; + hash = "sha256-3B1cUDldoTqLsbSARj2abM65nv+Ot0z/Fa35/klJXEY="; + unpackPhase = ovftoolZipUnpackPhase; }; - - ovftoolSystem = ovftoolSystems.${stdenv.system} or (throw "unsupported system ${stdenv.system}"); - -in -stdenv.mkDerivation { - pname = "ovftool"; - inherit (ovftoolSystem) version; - - src = fetchurl { - inherit (ovftoolSystem) name url hash; }; + ovftoolSystem = if builtins.hasAttr system ovftoolSystems then + ovftoolSystems.${system} + else throw "System '${system}' is unsupported by ovftool"; + + ovftoolSource = if builtins.hasAttr system ovftoolBundles then + ovftoolBundles.${system} + else + fetchurl { + inherit (ovftoolSystem) name url hash; + }; +in +stdenv.mkDerivation rec { + pname = "ovftool"; + inherit version; + + src = ovftoolSource; + buildInputs = [ + glibc + libxcrypt-legacy c-ares expat icu60 - libiconv - libxcrypt-legacy xercesc zlib - ] ++ lib.optionals stdenv.isLinux [ - glibc - ] ++ lib.optionals stdenv.isDarwin [ - darwin.Libsystem - libxml2 ]; - nativeBuildInputs = [ unzip makeWrapper ] - ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; + nativeBuildInputs = [ autoPatchelfHook makeWrapper unzip ]; - postUnpack = '' - # The linux package wraps ofvtool.bin with ovftool. Wrapping - # below in installPhase. - # Rename to ovftool on install for all systems to ovftool - if [[ -f ovftool.bin ]]; then - mv -v ovftool.bin ovftool - fi - ''; + preferLocalBuild = true; + sourceRoot = "."; + + unpackPhase = ovftoolSystem.unpackPhase; + + # Expects a directory named 'ovftool' containing the ovftool install. + # Based on https://aur.archlinux.org/packages/vmware-ovftool/ + # with the addition of a libexec directory and a Nix-style binary wrapper. installPhase = '' runHook preInstall - - # Based on https://aur.archlinux.org/packages/vmware-ovftool/ - # with the addition of a libexec directory and a Nix-style binary wrapper. - - # Almost all libs in the package appear to be VMware proprietary except for - # libgoogleurl and libcurl. The rest of the libraries that the installer - # extracts are omitted here, and provided in buildInputs. Since libcurl - # depends on VMware's OpenSSL, both libs are still used. - # FIXME: Replace libgoogleurl? Possibly from Chromium? - # FIXME: Tell VMware to use a modern version of OpenSSL. As of ovftool - # v4.6.2 ovftool uses openssl-1.0.2zh which in seems to be the extended - # support LTS release: https://www.openssl.org/support/contracts.html - - # Install all libs that are not patched in preFixup. - # Darwin dylibs are under `lib` in the zip. - install -m 755 -d "$out/lib" - install -m 644 -t "$out/lib" \ - '' + lib.optionalString stdenv.isLinux '' - libcrypto.so.1.0.2 \ - libcurl.so.4 \ + if [ -d ovftool ]; then + # Ensure we're in the staging directory + cd ovftool + fi + # libraries + install -m 755 -d "$out/lib/${pname}" + # These all appear to be VMWare proprietary except for libgoogleurl and libcurl. + # The rest of the libraries that the installer extracts are omitted here, + # and provided in buildInputs. Since libcurl depends on VMWare's OpenSSL, + # we have to use both here too. + # + # FIXME: can we replace libgoogleurl? Possibly from Chromium? + # FIXME: tell VMware to use a modern version of OpenSSL. + # + install -m 644 -t "$out/lib/${pname}" \ libgoogleurl.so.59 \ - libssl.so.1.0.2 \ libssoclient.so \ - libvim-types.so \ - libvmacore.so \ - libvmomi.so - '' + lib.optionalString stdenv.isDarwin '' - lib/libcrypto.1.0.2.dylib \ - lib/libcurl.4.dylib \ - lib/libgoogleurl.59.0.30.45.2.dylib \ - lib/libssl.1.0.2.dylib \ - lib/libssoclient.dylib \ - lib/libvim-types.dylib \ - lib/libvmacore.dylib \ - lib/libvmomi.dylib - '' + '' - # Install libexec binaries - # ovftool expects to be run relative to certain directories, namely `env`. - # Place the binary and those dirs in libexec. - install -m 755 -d "$out/libexec" - install -m 755 -t "$out/libexec" ovftool - install -m 644 -t "$out/libexec" icudt44l.dat - - # Install other libexec resources that need to be relative to the `ovftool` - # binary. + libvim-types.so libvmacore.so libvmomi.so \ + libcurl.so.4 libcrypto.so.1.0.2 libssl.so.1.0.2 + # libexec binaries + install -m 755 -d "$out/libexec/${pname}" + install -m 755 -t "$out/libexec/${pname}" ovftool.bin + install -m 644 -t "$out/libexec/${pname}" icudt44l.dat + # libexec resources for subdir in "certs" "env" "env/en" "schemas/DMTF" "schemas/vmware"; do - install -m 755 -d "$out/libexec/$subdir" - install -m 644 -t "$out/libexec/$subdir" "$subdir"/*.* + install -m 755 -d "$out/libexec/${pname}/$subdir" + install -m 644 -t "$out/libexec/${pname}/$subdir" "$subdir"/*.* done - - # Install EULA/OSS files - install -m 755 -d "$out/share/licenses" - install -m 644 -t "$out/share/licenses" \ - "vmware.eula" \ - "vmware-eula.rtf" \ - "open_source_licenses.txt" - - # Install Docs - install -m 755 -d "$out/share/doc" - install -m 644 -t "$out/share/doc" "README.txt" - - # Install final executable + # EULA/OSS files + install -m 755 -d "$out/share/licenses/${pname}" + install -m 644 -t "$out/share/licenses/${pname}" \ + "vmware.eula" "vmware-eula.rtf" "open_source_licenses.txt" + # documentation files + install -m 755 -d "$out/share/doc/${pname}" + install -m 644 -t "$out/share/doc/${pname}" "README.txt" + # binary wrapper; note that LC_CTYPE is defaulted to en_US.UTF-8 by + # VMWare's wrapper script. We use C.UTF-8 instead. install -m 755 -d "$out/bin" - makeWrapper "$out/libexec/ovftool" "$out/bin/ovftool" \ - '' + lib.optionalString stdenv.isLinux '' + makeWrapper "$out/libexec/${pname}/ovftool.bin" "$out/bin/ovftool" \ + --set-default LC_CTYPE C.UTF-8 \ --prefix LD_LIBRARY_PATH : "$out/lib" - '' + lib.optionalString stdenv.isDarwin '' - --prefix DYLD_LIBRARY_PATH : "$out/lib" - '' + '' runHook postInstall ''; - preFixup = lib.optionalString stdenv.isLinux '' + preFixup = '' addAutoPatchelfSearchPath "$out/lib" - '' + lib.optionalString stdenv.isDarwin '' - change_args=() - - # Change relative @loader_path dylibs to absolute paths. - for lib in $out/lib/*.dylib; do - libname=$(basename $lib) - change_args+=(-change "@loader_path/lib/$libname" "$out/lib/$libname") - done - - # Patches for ovftool binary - change_args+=(-change /usr/lib/libSystem.B.dylib ${darwin.Libsystem}/lib/libSystem.B.dylib) - change_args+=(-change /usr/lib/libc++.1.dylib ${stdenv.cc.libcxx.cxxabi}/lib/libc++.1.dylib) - change_args+=(-change /usr/lib/libiconv.2.dylib ${libiconv}/lib/libiconv.2.dylib) - change_args+=(-change /usr/lib/libxml2.2.dylib ${libxml2}/lib/libxml2.2.dylib) - change_args+=(-change /usr/lib/libz.1.dylib ${zlib}/lib/libz.1.dylib) - change_args+=(-change @loader_path/lib/libcares.2.dylib ${c-ares}/lib/libcares.2.dylib) - change_args+=(-change @loader_path/lib/libexpat.dylib ${expat}/lib/libexpat.dylib) - change_args+=(-change @loader_path/lib/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) - change_args+=(-change @loader_path/lib/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) - change_args+=(-change @loader_path/lib/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) - - # Patch binary - install_name_tool "''${change_args[@]}" "$out/libexec/ovftool" - - # Additional patches for ovftool dylibs - change_args+=(-change /usr/lib/libresolv.9.dylib ${darwin.Libsystem}/lib/libresolv.9.dylib) - change_args+=(-change @loader_path/libcares.2.dylib ${c-ares}/lib/libcares.2.dylib) - change_args+=(-change @loader_path/libexpat.dylib ${expat}/lib/libexpat.dylib) - change_args+=(-change @loader_path/libicudata.60.2.dylib ${icu60}/lib/libicudata.60.2.dylib) - change_args+=(-change @loader_path/libicuuc.60.2.dylib ${icu60}/lib/libicuuc.60.2.dylib) - change_args+=(-change @loader_path/libxerces-c-3.2.dylib ${xercesc}/lib/libxerces-c-3.2.dylib) - - # Add new abolute paths for other libs to all libs - for lib in $out/lib/*.dylib; do - libname=$(basename $lib) - change_args+=(-change "@loader_path/$libname" "$out/lib/$libname") - done - - # Patch all libs - for lib in $out/lib/*.dylib; do - libname=$(basename $lib) - install_name_tool -id "$libname" "$lib" - install_name_tool "''${change_args[@]}" "$lib" - done - ''; - - # These paths are need for install check tests - propagatedSandboxProfile = lib.optionalString stdenv.isDarwin '' - (allow file-read* (subpath "/usr/share/locale")) - (allow file-read* (subpath "/var/db/timezone")) - (allow file-read* (subpath "/System/Library/TextEncodings")) ''; doInstallCheck = true; - postInstallCheck = lib.optionalString stdenv.isDarwin '' - export HOME=$TMPDIR - # Construct a dummy /etc/passwd file - ovftool attempts to determine the - # user's "real" home using this - DUMMY_PASSWD="$(realpath $HOME/dummy-passwd)" - cat > $DUMMY_PASSWD < Date: Sat, 20 Apr 2024 13:58:57 +0200 Subject: [PATCH 84/89] vscode-extensions.adzero.vscode-sievehighlight: init 1.0.6 Release: https://github.com/adzero/vscode-sievehighlight/releases/tag/v1.0.6 --- .../editors/vscode/extensions/default.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/applications/editors/vscode/extensions/default.nix b/pkgs/applications/editors/vscode/extensions/default.nix index 6b3b5e81fde4..d7c8380930e7 100644 --- a/pkgs/applications/editors/vscode/extensions/default.nix +++ b/pkgs/applications/editors/vscode/extensions/default.nix @@ -144,6 +144,23 @@ let }; }; + adzero.vscode-sievehighlight = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-sievehighlight"; + publisher = "adzero"; + version = "1.0.6"; + hash = "sha256-8Ompv792eI2kIH+5+KPL9jAf88xsMGQewHEQwi8BhoQ="; + }; + meta = { + changelog = "https://marketplace.visualstudio.com/items/adzero.vscode-sievehighlight/changelog"; + description = "A Visual Studio Code extension to enable syntax highlight support for Sieve mail filtering language"; + downloadPage = "https://marketplace.visualstudio.com/items?itemName=adzero.vscode-sievehighlight"; + homepage = "https://github.com/adzero/vscode-sievehighlight"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.sebtm ]; + }; + }; + alanz.vscode-hie-server = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-hie-server"; From 5b65a57ea08215a7c62d837baf5c22553fc2891b Mon Sep 17 00:00:00 2001 From: emilylange Date: Sat, 20 Apr 2024 21:57:26 +0200 Subject: [PATCH 85/89] forgejo: 1.21.11-0 -> 1.21.11-1 https://codeberg.org/forgejo/forgejo/releases/tag/v1.21.11-1 https://codeberg.org/forgejo/forgejo/src/branch/forgejo/RELEASE-NOTES.md#1-21-11-1 diff: https://codeberg.org/forgejo/forgejo/compare/v1.21.11-0...v1.21.11-1 --- pkgs/applications/version-management/forgejo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/forgejo/default.nix b/pkgs/applications/version-management/forgejo/default.nix index 85613530ba39..65c683ddbe76 100644 --- a/pkgs/applications/version-management/forgejo/default.nix +++ b/pkgs/applications/version-management/forgejo/default.nix @@ -39,14 +39,14 @@ let in buildGoModule rec { pname = "forgejo"; - version = "1.21.11-0"; + version = "1.21.11-1"; src = fetchFromGitea { domain = "codeberg.org"; owner = "forgejo"; repo = "forgejo"; rev = "v${version}"; - hash = "sha256-Cp+dN4nTIboin42NJR/YUkVXbBC7uufH8EE7NgIVFzY="; + hash = "sha256-7oYsoZpZcNIUw3iXSi1Q5So2yYgKnT5U7GHQ4NVqVdc="; # Forgejo has multiple different version strings that need to be provided # via ldflags. main.ForgejoVersion for example is a combination of a # hardcoded gitea compatibility version string (in the Makefile) and From e12029c3049265cb52126adf9eba0de96d36fa3b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Apr 2024 22:26:00 +0200 Subject: [PATCH 86/89] home-assistant-custom-components.miele: 0.1.19 -> 2024.3.0 https://github.com/astrandb/miele/releases/tag/v0.1.20 https://github.com/astrandb/miele/releases/tag/v0.1.21 https://github.com/astrandb/miele/releases/tag/v2024.1.0 https://github.com/astrandb/miele/releases/tag/v2024.3.0 --- .../home-assistant/custom-components/miele/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/miele/default.nix b/pkgs/servers/home-assistant/custom-components/miele/default.nix index 71624f674b4d..3ebdc6283c03 100644 --- a/pkgs/servers/home-assistant/custom-components/miele/default.nix +++ b/pkgs/servers/home-assistant/custom-components/miele/default.nix @@ -8,13 +8,13 @@ buildHomeAssistantComponent rec { owner = "astrandb"; domain = "miele"; - version = "0.1.19"; + version = "2024.3.0"; src = fetchFromGitHub { inherit owner; repo = domain; rev = "refs/tags/v${version}"; - hash = "sha256-od7DV10/rkIw9eFMsTRw4bMmhQo9BAmw2rCbKKySeIk="; + hash = "sha256-J9n4PFcd87L301B2YktrLcxp5Vu1HwDeCYnrMEJ0+TA="; }; propagatedBuildInputs = [ From d68481224a09ce13d43305f60f15fc745e087639 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sat, 20 Apr 2024 22:49:08 +0200 Subject: [PATCH 87/89] nixos/release-small: fix eval Provide nixpkgs.release-checks, which has been extracted out of the tarball job into a dedicated one. --- nixos/release-small.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index d4de2fd8df4f..091c2b1f305b 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -81,6 +81,7 @@ in rec { php postgresql python + release-checks rsyslog stdenv subversion From 451188832a2f29830c695d85fb52100fc283a703 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 20:51:52 +0000 Subject: [PATCH 88/89] python311Packages.txtai: 7.0.0 -> 7.1.0 --- pkgs/development/python-modules/txtai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/txtai/default.nix b/pkgs/development/python-modules/txtai/default.nix index 4bf59621b5ca..256ed0889bfe 100644 --- a/pkgs/development/python-modules/txtai/default.nix +++ b/pkgs/development/python-modules/txtai/default.nix @@ -52,7 +52,7 @@ , unittestCheckHook }: let - version = "7.0.0"; + version = "7.1.0"; api = [ aiohttp fastapi uvicorn ]; # cloud = [ apache-libcloud ]; console = [ rich ]; @@ -105,7 +105,7 @@ buildPythonPackage { owner = "neuml"; repo = "txtai"; rev = "refs/tags/v${version}"; - hash = "sha256-dYAzbdGEu9gAUzptuSfej6T5LPyTneRWigdAMlGgeqM="; + hash = "sha256-L+L2jRkCQKOgd1k3N4mft0Kt6kvCN81lgSQUjoon5rk="; }; nativeBuildInputs = [ From 23e8ad4cee19b21dad3f29944ad8186897f8ff25 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 20 Apr 2024 15:47:57 +0000 Subject: [PATCH 89/89] cakelisp: 0.3.0-unstable-2024-04-01 -> 0.3.0-unstable-2024-04-18 --- pkgs/development/compilers/cakelisp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/cakelisp/default.nix b/pkgs/development/compilers/cakelisp/default.nix index 1dffc52f7576..c71f2dd48e21 100644 --- a/pkgs/development/compilers/cakelisp/default.nix +++ b/pkgs/development/compilers/cakelisp/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation { pname = "cakelisp"; # using unstable as it's the only version that builds against gcc-13 - version = "0.3.0-unstable-2024-04-01"; + version = "0.3.0-unstable-2024-04-18"; src = fetchgit { url = "https://macoy.me/code/macoy/cakelisp"; - rev = "7f09a08623f4141d3c2940bca3e8ea646a7049cc"; - hash = "sha256-5ey2j38bhoRADMFcTGcUiOHE/UlU2mPGqzfv7dEk6oQ="; + rev = "115ab436056602b7f3a1ca30be40edbfcc88299d"; + hash = "sha256-rgBtT24aopXLTeDffjXGvJ3RgT+QLlr50Ju9a6ccyzc="; }; buildInputs = [ gcc ];