From 410ae87bf5e27aa37044c204b7add6bb18d364f3 Mon Sep 17 00:00:00 2001 From: lucasew Date: Fri, 5 Jul 2024 14:32:19 -0300 Subject: [PATCH 1/7] nixos/boinc: use exec to start the payload binary Signed-off-by: lucasew --- nixos/modules/services/computing/boinc/client.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/computing/boinc/client.nix b/nixos/modules/services/computing/boinc/client.nix index c2132149a3f5..b3ec033d5a84 100644 --- a/nixos/modules/services/computing/boinc/client.nix +++ b/nixos/modules/services/computing/boinc/client.nix @@ -98,7 +98,7 @@ in after = ["network.target"]; wantedBy = ["multi-user.target"]; script = '' - ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag} + exec ${fhsEnvExecutable} --dir ${cfg.dataDir} ${allowRemoteGuiRpcFlag} ''; serviceConfig = { User = "boinc"; From 5d49d4cfa1a4ceb5cfaad343c436c2e9e48de913 Mon Sep 17 00:00:00 2001 From: lucasew Date: Wed, 20 Mar 2024 17:16:30 -0300 Subject: [PATCH 2/7] nixos/guix: use exec to start the payload binary Signed-off-by: lucasew --- nixos/modules/services/misc/guix/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/guix/default.nix b/nixos/modules/services/misc/guix/default.nix index 7174ff36b709..4b853c7198cf 100644 --- a/nixos/modules/services/misc/guix/default.nix +++ b/nixos/modules/services/misc/guix/default.nix @@ -213,7 +213,7 @@ in systemd.services.guix-daemon = { environment = serviceEnv; script = '' - ${lib.getExe' package "guix-daemon"} \ + exec ${lib.getExe' package "guix-daemon"} \ --build-users-group=${cfg.group} \ ${lib.escapeShellArgs cfg.extraArgs} ''; @@ -324,7 +324,7 @@ in } ''; script = '' - ${lib.getExe' package "guix"} publish \ + exec ${lib.getExe' package "guix"} publish \ --user=${cfg.publish.user} --port=${builtins.toString cfg.publish.port} \ ${lib.escapeShellArgs cfg.publish.extraArgs} ''; @@ -380,12 +380,10 @@ in description = "Guix garbage collection"; startAt = cfg.gc.dates; script = '' - ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs} + exec ${lib.getExe' package "guix"} gc ${lib.escapeShellArgs cfg.gc.extraArgs} ''; - serviceConfig = { Type = "oneshot"; - PrivateDevices = true; PrivateNetworks = true; ProtectControlGroups = true; From d037904ba3edcc645ddc8893dff4fce2b3258b00 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 6 Nov 2024 19:26:31 -0500 Subject: [PATCH 3/7] brave: refactor package.nix to allow more architectures --- pkgs/by-name/br/brave/package.nix | 48 +++++++++++++++----------- pkgs/by-name/br/brave/update.sh | 56 +++++++++++++++++-------------- 2 files changed, 59 insertions(+), 45 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index 591496c8851b..bbca52b5ad5a 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -1,24 +1,32 @@ # Expression generated by update.sh; do not edit it by hand! { stdenv, callPackage, ... }@args: -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) - ( - if stdenv.hostPlatform.isAarch64 then - rec { - pname = "brave"; - version = "1.71.121"; - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk="; - platform = "aarch64-linux"; - } - else if stdenv.hostPlatform.isx86_64 then - rec { - pname = "brave"; - version = "1.71.121"; - url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0="; - platform = "x86_64-linux"; - } +let + pname = "brave"; + version = "1.71.121"; + + allArchives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; + hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk="; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; + hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0="; + }; + }; + + archive = + if builtins.hasAttr stdenv.system allArchives then + allArchives.${stdenv.system} else - throw "Unsupported platform." - ) + throw "Unsupported platform."; + +in +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( + archive + // { + inherit pname version; + platform = stdenv.system; + } +) diff --git a/pkgs/by-name/br/brave/update.sh b/pkgs/by-name/br/brave/update.sh index aff0dd552102..306f4d12e53b 100755 --- a/pkgs/by-name/br/brave/update.sh +++ b/pkgs/by-name/br/brave/update.sh @@ -1,17 +1,15 @@ #!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl gnused nix +#!nix-shell -i bash -p curl gnused nix jq SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" -latestVersionAarch64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ - | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" +latestVersion="$(curl --fail -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/brave/brave-browser/releases/latest" | jq -r '.tag_name' | sed 's/^v//')" + hashAarch64="$(nix hash to-sri --type sha256 \ $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-arm64/Packages \ | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) )" -latestVersionAmd64="$(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ - | sed -r -n 's/^Version: (.*)/\1/p' | head -n1)" hashAmd64="$(nix hash to-sri --type sha256 \ $(curl -sL https://brave-browser-apt-release.s3.brave.com/dists/stable/main/binary-amd64/Packages \ | sed -r -n 's/^SHA256: (.*)/\1/p' | head -n1) @@ -21,25 +19,33 @@ cat > $SCRIPT_DIR/package.nix << EOF # Expression generated by update.sh; do not edit it by hand! { stdenv, callPackage, ... }@args: -callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) - ( - if stdenv.hostPlatform.isAarch64 then - rec { - pname = "brave"; - version = "${latestVersionAarch64}"; - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; - hash = "${hashAarch64}"; - platform = "aarch64-linux"; - } - else if stdenv.hostPlatform.isx86_64 then - rec { - pname = "brave"; - version = "${latestVersionAmd64}"; - url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; - hash = "${hashAmd64}"; - platform = "x86_64-linux"; - } +let + pname = "brave"; + version = "${latestVersion}"; + + allArchives = { + aarch64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_arm64.deb"; + hash = "${hashAarch64}"; + }; + x86_64-linux = { + url = "https://github.com/brave/brave-browser/releases/download/v\${version}/brave-browser_\${version}_amd64.deb"; + hash = "${hashAmd64}"; + }; + }; + + archive = + if builtins.hasAttr stdenv.system allArchives then + allArchives.\${stdenv.system} else - throw "Unsupported platform." - ) + throw "Unsupported platform."; + +in +callPackage ./make-brave.nix (removeAttrs args [ "callPackage" ]) ( + archive + // { + inherit pname version; + platform = stdenv.system; + } +) EOF From 301751f1c1bb0afdb9482093f88e370afed527b5 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 6 Nov 2024 19:42:19 -0500 Subject: [PATCH 4/7] brave: format with nixfmt-rfc-style --- pkgs/by-name/br/brave/make-brave.nix | 329 ++++++++++++++++----------- 1 file changed, 202 insertions(+), 127 deletions(-) diff --git a/pkgs/by-name/br/brave/make-brave.nix b/pkgs/by-name/br/brave/make-brave.nix index e902fe3c4da2..d0fe9afde4dc 100644 --- a/pkgs/by-name/br/brave/make-brave.nix +++ b/pkgs/by-name/br/brave/make-brave.nix @@ -1,103 +1,155 @@ -{ lib, stdenv, fetchurl, buildPackages -, alsa-lib -, at-spi2-atk -, at-spi2-core -, atk -, cairo -, cups -, dbus -, dpkg -, expat -, fontconfig -, freetype -, gdk-pixbuf -, glib -, adwaita-icon-theme -, gsettings-desktop-schemas -, gtk3 -, gtk4 -, qt6 -, libX11 -, libXScrnSaver -, libXcomposite -, libXcursor -, libXdamage -, libXext -, libXfixes -, libXi -, libXrandr -, libXrender -, libXtst -, libdrm -, libkrb5 -, libuuid -, libxkbcommon -, libxshmfence -, mesa -, nspr -, nss -, pango -, pipewire -, snappy -, udev -, wayland -, xdg-utils -, coreutils -, xorg -, zlib +{ + lib, + stdenv, + fetchurl, + buildPackages, + alsa-lib, + at-spi2-atk, + at-spi2-core, + atk, + cairo, + cups, + dbus, + dpkg, + expat, + fontconfig, + freetype, + gdk-pixbuf, + glib, + adwaita-icon-theme, + gsettings-desktop-schemas, + gtk3, + gtk4, + qt6, + libX11, + libXScrnSaver, + libXcomposite, + libXcursor, + libXdamage, + libXext, + libXfixes, + libXi, + libXrandr, + libXrender, + libXtst, + libdrm, + libkrb5, + libuuid, + libxkbcommon, + libxshmfence, + mesa, + nspr, + nss, + pango, + pipewire, + snappy, + udev, + wayland, + xdg-utils, + coreutils, + xorg, + zlib, -# command line arguments which are always set e.g "--disable-gpu" -, commandLineArgs ? "" + # command line arguments which are always set e.g "--disable-gpu" + commandLineArgs ? "", -# Necessary for USB audio devices. -, pulseSupport ? stdenv.hostPlatform.isLinux -, libpulseaudio + # Necessary for USB audio devices. + pulseSupport ? stdenv.hostPlatform.isLinux, + libpulseaudio, -# For GPU acceleration support on Wayland (without the lib it doesn't seem to work) -, libGL + # For GPU acceleration support on Wayland (without the lib it doesn't seem to work) + libGL, -# For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) -, libvaSupport ? stdenv.hostPlatform.isLinux -, libva -, enableVideoAcceleration ? libvaSupport + # For video acceleration via VA-API (--enable-features=VaapiVideoDecoder,VaapiVideoEncoder) + libvaSupport ? stdenv.hostPlatform.isLinux, + libva, + enableVideoAcceleration ? libvaSupport, -# For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API -, vulkanSupport ? false -, addDriverRunpath -, enableVulkan ? vulkanSupport + # For Vulkan support (--enable-features=Vulkan); disabled by default as it seems to break VA-API + vulkanSupport ? false, + addDriverRunpath, + enableVulkan ? vulkanSupport, }: -{ pname -, version -, hash -, url -, platform +{ + pname, + version, + hash, + url, + platform, }: let - inherit (lib) optional optionals makeLibraryPath makeSearchPathOutput makeBinPath - optionalString strings escapeShellArg; + inherit (lib) + optional + optionals + makeLibraryPath + makeSearchPathOutput + makeBinPath + optionalString + strings + escapeShellArg + ; deps = [ - alsa-lib at-spi2-atk at-spi2-core atk cairo cups dbus expat - fontconfig freetype gdk-pixbuf glib gtk3 gtk4 libdrm libX11 libGL - libxkbcommon libXScrnSaver libXcomposite libXcursor libXdamage - libXext libXfixes libXi libXrandr libXrender libxshmfence - libXtst libuuid mesa nspr nss pango pipewire udev wayland - xorg.libxcb zlib snappy libkrb5 qt6.qtbase - ] - ++ optional pulseSupport libpulseaudio - ++ optional libvaSupport libva; + alsa-lib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + gdk-pixbuf + glib + gtk3 + gtk4 + libdrm + libX11 + libGL + libxkbcommon + libXScrnSaver + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libxshmfence + libXtst + libuuid + mesa + nspr + nss + pango + pipewire + udev + wayland + xorg.libxcb + zlib + snappy + libkrb5 + qt6.qtbase + ] ++ optional pulseSupport libpulseaudio ++ optional libvaSupport libva; rpath = makeLibraryPath deps + ":" + makeSearchPathOutput "lib" "lib64" deps; binpath = makeBinPath deps; - enableFeatures = optionals enableVideoAcceleration [ "VaapiVideoDecoder" "VaapiVideoEncoder" ] + enableFeatures = + optionals enableVideoAcceleration [ + "VaapiVideoDecoder" + "VaapiVideoEncoder" + ] ++ optional enableVulkan "Vulkan"; - disableFeatures = [ "OutdatedBuildDetector" ] # disable automatic updates + disableFeatures = + [ "OutdatedBuildDetector" ] # disable automatic updates # The feature disable is needed for VAAPI to work correctly: https://github.com/brave/brave-browser/issues/20935 - ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; + ++ optionals enableVideoAcceleration [ "UseChromeOSDirectVideoDecoder" ]; in stdenv.mkDerivation { inherit pname version; @@ -120,7 +172,10 @@ stdenv.mkDerivation { buildInputs = [ # needed for GSETTINGS_SCHEMAS_PATH - glib gsettings-desktop-schemas gtk3 gtk4 + glib + gsettings-desktop-schemas + gtk3 + gtk4 # needed for XDG_ICON_DIRS adwaita-icon-theme @@ -129,51 +184,51 @@ stdenv.mkDerivation { unpackPhase = "dpkg-deb --fsys-tarfile $src | tar -x --no-same-permissions --no-same-owner"; installPhase = '' - runHook preInstall + runHook preInstall - mkdir -p $out $out/bin + mkdir -p $out $out/bin - cp -R usr/share $out - cp -R opt/ $out/opt + cp -R usr/share $out + cp -R opt/ $out/opt - export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser + export BINARYWRAPPER=$out/opt/brave.com/brave/brave-browser - # Fix path to bash in $BINARYWRAPPER - substituteInPlace $BINARYWRAPPER \ - --replace /bin/bash ${stdenv.shell} + # Fix path to bash in $BINARYWRAPPER + substituteInPlace $BINARYWRAPPER \ + --replace /bin/bash ${stdenv.shell} - ln -sf $BINARYWRAPPER $out/bin/brave + ln -sf $BINARYWRAPPER $out/bin/brave - for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${rpath}" $exe - done + for exe in $out/opt/brave.com/brave/{brave,chrome_crashpad_handler}; do + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpath}" $exe + done - # Fix paths - substituteInPlace $out/share/applications/brave-browser.desktop \ - --replace /usr/bin/brave-browser-stable $out/bin/brave - substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/share/menu/brave-browser.menu \ - --replace /opt/brave.com $out/opt/brave.com - substituteInPlace $out/opt/brave.com/brave/default-app-block \ - --replace /opt/brave.com $out/opt/brave.com + # Fix paths + substituteInPlace $out/share/applications/brave-browser.desktop \ + --replace /usr/bin/brave-browser-stable $out/bin/brave + substituteInPlace $out/share/gnome-control-center/default-apps/brave-browser.xml \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/share/menu/brave-browser.menu \ + --replace /opt/brave.com $out/opt/brave.com + substituteInPlace $out/opt/brave.com/brave/default-app-block \ + --replace /opt/brave.com $out/opt/brave.com - # Correct icons location - icon_sizes=("16" "24" "32" "48" "64" "128" "256") + # Correct icons location + icon_sizes=("16" "24" "32" "48" "64" "128" "256") - for icon in ''${icon_sizes[*]} - do - mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps - ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png - done + for icon in ''${icon_sizes[*]} + do + mkdir -p $out/share/icons/hicolor/$icon\x$icon/apps + ln -s $out/opt/brave.com/brave/product_logo_$icon.png $out/share/icons/hicolor/$icon\x$icon/apps/brave-browser.png + done - # Replace xdg-settings and xdg-mime - ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings - ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime + # Replace xdg-settings and xdg-mime + ln -sf ${xdg-utils}/bin/xdg-settings $out/opt/brave.com/brave/xdg-settings + ln -sf ${xdg-utils}/bin/xdg-mime $out/opt/brave.com/brave/xdg-mime - runHook postInstall + runHook postInstall ''; preFixup = '' @@ -181,16 +236,25 @@ stdenv.mkDerivation { gappsWrapperArgs+=( --prefix LD_LIBRARY_PATH : ${rpath} --prefix PATH : ${binpath} - --suffix PATH : ${lib.makeBinPath [ xdg-utils coreutils ]} - ${optionalString (enableFeatures != []) '' - --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}" - ''} - ${optionalString (disableFeatures != []) '' - --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" - ''} + --suffix PATH : ${ + lib.makeBinPath [ + xdg-utils + coreutils + ] + } + ${ + optionalString (enableFeatures != [ ]) '' + --add-flags "--enable-features=${strings.concatStringsSep "," enableFeatures}\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+,WaylandWindowDecorations}}" + '' + } + ${ + optionalString (disableFeatures != [ ]) '' + --add-flags "--disable-features=${strings.concatStringsSep "," disableFeatures}" + '' + } --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto}}" ${optionalString vulkanSupport '' - --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share" + --prefix XDG_DATA_DIRS : "${addDriverRunpath.driverLink}/share" ''} --add-flags ${escapeShellArg commandLineArgs} ) @@ -206,7 +270,9 @@ stdenv.mkDerivation { meta = { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; - changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + lib.replaceStrings [ "." ] [ "" ] version; + changelog = + "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#" + + lib.replaceStrings [ "." ] [ "" ] version; longDescription = '' Brave browser blocks the ads and trackers that slow you down, chew up your bandwidth, and invade your privacy. Brave lets you @@ -214,8 +280,17 @@ stdenv.mkDerivation { ''; sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; license = lib.licenses.mpl20; - maintainers = with lib.maintainers; [ uskudnik rht jefflabonte nasirhm buckley310 ]; - platforms = [ "aarch64-linux" "x86_64-linux" ]; + maintainers = with lib.maintainers; [ + uskudnik + rht + jefflabonte + nasirhm + buckley310 + ]; + platforms = [ + "aarch64-linux" + "x86_64-linux" + ]; mainProgram = "brave"; }; } From 7135b364b6e3639d96a1f3909161110c07d0b927 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Wed, 6 Nov 2024 19:42:43 -0500 Subject: [PATCH 5/7] brave: 1.71.121 -> 1.71.123 https://community.brave.com/t/release-channel-1-71-123/579271 --- pkgs/by-name/br/brave/package.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/by-name/br/brave/package.nix b/pkgs/by-name/br/brave/package.nix index bbca52b5ad5a..79bc50213e4d 100644 --- a/pkgs/by-name/br/brave/package.nix +++ b/pkgs/by-name/br/brave/package.nix @@ -3,16 +3,16 @@ let pname = "brave"; - version = "1.71.121"; + version = "1.71.123"; allArchives = { aarch64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_arm64.deb"; - hash = "sha256-+MBZXtgaEiTqEd63HpPbi4KjHOHPRRcf8q3QDe+YsKk="; + hash = "sha256-u3fme771Q5F00fYiLez9mhGQR2mORYdSabXovr0+OYE="; }; x86_64-linux = { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - hash = "sha256-sc2FFSttm9+yh8atJQ6KS5ZL87Ov9vUXJeVKYTPNpy0="; + hash = "sha256-fJczTAra+j8+veicz4lIyKSNJyxJK4q9gpZoAyQwkxQ="; }; }; From 8339db676638e022d21f667f517c796bd3f73a30 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sun, 10 Nov 2024 17:51:15 +0100 Subject: [PATCH 6/7] home-assistant-custom-components.better_thermostat: 1.6.0 -> 1.6.1 add gitUpdater update script for stable versions --- .../custom-components/better_thermostat/package.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix index 414449cabb38..473f54e5324f 100644 --- a/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix +++ b/pkgs/servers/home-assistant/custom-components/better_thermostat/package.nix @@ -2,18 +2,23 @@ buildHomeAssistantComponent, fetchFromGitHub, lib, + gitUpdater, }: buildHomeAssistantComponent rec { owner = "KartoffelToby"; domain = "better_thermostat"; - version = "1.6.0"; + version = "1.6.1"; src = fetchFromGitHub { owner = "KartoffelToby"; repo = "better_thermostat"; rev = "refs/tags/${version}"; - hash = "sha256-9iwrGKk3/m38ghDVGzKODWo9vzzZxJ91413/KWnULJU="; + hash = "sha256-zXO2UDLhSTOemzsO9G5ZUzr50Zg8kDW/aObn6Y3j70k="; + }; + + passthru.updateScript = gitUpdater { + ignoredVersions = "(Alpha|Beta|alpha|beta).*"; }; meta = { From 2544da75c5bfcfed05b8cab336fc2f3c1290eb93 Mon Sep 17 00:00:00 2001 From: Ryan Horiguchi Date: Mon, 11 Nov 2024 02:24:41 +0900 Subject: [PATCH 7/7] home-assistant-custom-lovelace-modules.dirigera_platform: init at 2.6.4 (#350542) --- .../dirigera_platform/package.nix | 33 +++++++++++++++++++ 1 file changed, 33 insertions(+) create mode 100644 pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix diff --git a/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix new file mode 100644 index 000000000000..4cc44ef19db0 --- /dev/null +++ b/pkgs/servers/home-assistant/custom-components/dirigera_platform/package.nix @@ -0,0 +1,33 @@ +{ + lib, + fetchFromGitHub, + buildHomeAssistantComponent, + dirigera, +}: + +buildHomeAssistantComponent rec { + owner = "sanjoyg"; + domain = "dirigera_platform"; + version = "2.6.4"; + + src = fetchFromGitHub { + owner = "sanjoyg"; + repo = "dirigera_platform"; + rev = version; + hash = "sha256-ftJUmJ5UWgm22YBfCIBAxRjG+niougw5ekrQNuSRgzI="; + }; + + postPatch = '' + substituteInPlace custom_components/dirigera_platform/manifest.json \ + --replace-fail "0.0.1" "${version}" + ''; + + dependencies = [ dirigera ]; + + meta = with lib; { + description = "Home-assistant integration for IKEA Dirigera hub"; + homepage = "https://github.com/sanjoyg/dirigera_platform"; + maintainers = with maintainers; [ rhoriguchi ]; + license = licenses.mit; + }; +}