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