plausible: 2.1.4 -> 2.1.5 (#382345)

authored by xanderio and committed by GitHub 0b19dd9e 248e19dc

+36 -31
+36 -17
pkgs/servers/web-apps/plausible/default.nix
··· 8 8 runCommand, 9 9 nixosTests, 10 10 npm-lockfile-fix, 11 + nix-update-script, 11 12 brotli, 12 13 tailwindcss_3, 13 14 esbuild, ··· 16 17 17 18 let 18 19 pname = "plausible"; 19 - version = "2.1.4"; 20 + version = "2.1.5"; 20 21 mixEnv = "ce"; 21 22 22 23 src = fetchFromGitHub { 23 24 owner = "plausible"; 24 25 repo = "analytics"; 25 26 rev = "v${version}"; 26 - hash = "sha256-wV2zzRKJM5pQ06pF8vt1ieFqv6s3HvCzNT5Hed29Owk="; 27 + hash = "sha256-4gwK/AxzhsU0vgvKgIXrOyQLCgZMeZyKjj7PWbUmJ+8="; 27 28 postFetch = '' 28 29 ${lib.getExe npm-lockfile-fix} $out/assets/package-lock.json 29 30 sed -ie ' ··· 74 75 src 75 76 mixEnv 76 77 ; 77 - hash = "sha256-N6cYlYwNss2FPYcljANJYbXobmLFauZ64F7Sf/+7Ctg="; 78 + hash = "sha256-edQ8byeV0WUaYDYMnmrstC6L2jztidR/JikGZLpX3WE="; 78 79 }; 79 80 80 81 mjmlNif = rustPlatform.buildRustPackage { ··· 91 92 }; 92 93 }; 93 94 94 - patchedMixFodDeps = runCommand mixFodDeps.name { } '' 95 - mkdir $out 96 - cp -r --no-preserve=mode ${mixFodDeps}/. $out 95 + patchedMixFodDeps = 96 + runCommand mixFodDeps.name 97 + { 98 + inherit (mixFodDeps) hash; 99 + } 100 + '' 101 + mkdir $out 102 + cp -r --no-preserve=mode ${mixFodDeps}/. $out 97 103 98 - mkdir -p $out/mjml/priv/native 99 - for lib in ${mjmlNif}/lib/* 100 - do 101 - # normalies suffix to .so, otherswise build would fail on darwin 102 - file=''${lib##*/} 103 - base=''${file%.*} 104 - ln -s "$lib" $out/mjml/priv/native/$base.so 105 - done 106 - ''; 104 + mkdir -p $out/mjml/priv/native 105 + for lib in ${mjmlNif}/lib/* 106 + do 107 + # normalies suffix to .so, otherswise build would fail on darwin 108 + file=''${lib##*/} 109 + base=''${file%.*} 110 + ln -s "$lib" $out/mjml/priv/native/$base.so 111 + done 112 + ''; 107 113 108 114 in 109 115 beamPackages.mixRelease rec { ··· 125 131 tests = { 126 132 inherit (nixosTests) plausible; 127 133 }; 128 - updateScript = ./update.sh; 129 - inherit assets tracker; 134 + updateScript = nix-update-script { 135 + extraArgs = [ 136 + "-s" 137 + "tracker" 138 + "-s" 139 + "assets" 140 + "-s" 141 + "mjmlNif" 142 + ]; 143 + }; 144 + inherit 145 + assets 146 + tracker 147 + mjmlNif 148 + ; 130 149 }; 131 150 132 151 env = {
-14
pkgs/servers/web-apps/plausible/update.sh
··· 1 - #!/usr/bin/env nix-shell 2 - #!nix-shell -i bash -p nix-update jq elixir npm-lockfile-fix nixfmt-rfc-style 3 - 4 - set -euxo pipefail 5 - 6 - nix-update plausible 7 - 8 - version="$(nix-instantiate -A plausible.version --eval --json | jq -r)" 9 - source_url="$(nix-instantiate -A plausible.src.url --eval --json | jq -r)" 10 - 11 - nix-update --url "$source_url" --version "$version" plausible.tracker 12 - nix-update --url "$source_url" --version "$version" plausible.assets 13 - 14 -