pyrox.dev / nixpkgs
lol
fork atom

firefox-bin: fix updateScript (#416941)

authored by Sandro and committed by GitHub 35942d88 88f57891

+2 -13
unified split
-1
pkgs/applications/networking/browsers/firefox-bin/default.nix
··· 142 142 updateScript = import ./update.nix { 143 143 inherit 144 144 pname 145 - lib 146 145 writeScript 147 146 xidel 148 147 coreutils
+2 -10
pkgs/applications/networking/browsers/firefox-bin/update.nix
··· 1 1 { 2 2 pname, 3 - channel, 4 - lib, 5 3 writeScript, 6 4 xidel, 7 5 coreutils, ··· 16 14 versionSuffix ? "", 17 15 }: 18 16 19 - let 20 - isBeta = channel != "release"; 21 - 22 - in 23 17 writeScript "update-${pname}" '' 24 18 #!${runtimeShell} 25 19 PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin ··· 49 43 grep "^[0-9]" | \ 50 44 sort --version-sort | \ 51 45 grep -v "funnelcake" | \ 52 - grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${ 53 - lib.optionalString (!isBeta) "grep -v \"b\" |" 54 - } \ 46 + grep -e "\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | grep -v "b" | \ 55 47 tail -1` 56 48 57 49 curl --silent -o $HOME/shasums "$url$version/SHA256SUMS" ··· 94 86 } 95 87 EOF 96 88 97 - mv $tmpfile ${channel}${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix 89 + mv $tmpfile release${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix 98 90 99 91 popd 100 92 ''
-2
pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix
··· 104 104 passthru.updateScript = import ./../../browsers/firefox-bin/update.nix { 105 105 inherit 106 106 pname 107 - lib 108 107 writeScript 109 108 xidel 110 109 coreutils ··· 116 115 versionSuffix 117 116 ; 118 117 baseName = "thunderbird"; 119 - channel = "release"; 120 118 basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin"; 121 119 baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/"; 122 120 };