Skip to content

Conversation

@rhoriguchi
Copy link
Contributor

Could only get the update script to work with this patch, not sure why I had to enable flake support. Probably related to msteen/nix-prefetch#35

diff --git a/pkgs/servers/adguardhome/update.sh b/pkgs/servers/adguardhome/update.sh
index 4e3ecfbfaca4..b85129e8289a 100755
--- a/pkgs/servers/adguardhome/update.sh
+++ b/pkgs/servers/adguardhome/update.sh
@@ -36,7 +36,7 @@ for asset in $(curl --silent https://api.github.com/repos/AdguardTeam/AdGuardHom
     if [ -n "$adg_system" ]; then
         fetch="$(grep '\.zip$' <<< "$url" > /dev/null && echo fetchzip || echo fetchurl)"
         nix_system=${systems[$adg_system]}
-        nix_src="$(nix-prefetch -s --output nix $fetch --url $url)"
+        nix_src="$(nix-prefetch --option extra-experimental-features flakes -s --output nix $fetch --url $url)"
         echo "$nix_system = $fetch $nix_src;" >> $bins
     fi
 done

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@github-actions github-actions bot added 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. labels Mar 26, 2025
@nix-owners nix-owners bot requested review from iagocq and numkem March 26, 2025 18:35
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 2, 2025
@rhoriguchi rhoriguchi changed the title adguardhome: 0.107.57 -> 0.107.59 adguardhome: 0.107.57 -> 0.107.60 Apr 15, 2025
@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Apr 17, 2025
@pbsds
Copy link
Member

pbsds commented Apr 19, 2025

Please add your fix to the update script :)

@rhoriguchi rhoriguchi changed the title adguardhome: 0.107.57 -> 0.107.60 adguardhome: 0.107.57 -> 0.107.61 Apr 23, 2025
@pbsds
Copy link
Member

pbsds commented Apr 23, 2025

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 393454


x86_64-linux

✅ 1 package built:
  • adguardhome

aarch64-linux

✅ 1 package built:
  • adguardhome

x86_64-darwin

✅ 1 package built:
  • adguardhome

aarch64-darwin

✅ 1 package built:
  • adguardhome

@pbsds pbsds merged commit 17f5945 into NixOS:master Apr 23, 2025
31 of 35 checks passed
@rhoriguchi rhoriguchi deleted the adguardhome branch April 23, 2025 16:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

10.rebuild-darwin: 1-10 This PR causes between 1 and 10 packages to rebuild on Darwin. 10.rebuild-darwin: 1 This PR causes 1 package to rebuild on Darwin. 10.rebuild-linux: 1-10 This PR causes between 1 and 10 packages to rebuild on Linux. 10.rebuild-linux: 1 This PR causes 1 package to rebuild on Linux.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants