Unverified Commit 35942d88 authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

firefox-bin: fix updateScript (#416941)

parents 88f57891 5c44b02d

pkgs/applications/networking/browsers/firefox-bin/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -142,7 +142,6 @@ stdenv.mkDerivation { 
    updateScript = import ./update.nix {

      inherit

        pname

        lib

        writeScript

        xidel

        coreutils

pkgs/applications/networking/browsers/firefox-bin/update.nix

+2 −10
Original line number Diff line number Diff line 
{

  pname,

  channel,

  lib,

  writeScript,

  xidel,

  coreutils,
@@ -16,10 +14,6 @@ 
  versionSuffix ? "",

}:



let

  isBeta = channel != "release";



in

writeScript "update-${pname}" ''

  #!${runtimeShell}

  PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
@@ -49,9 +43,7 @@ writeScript "update-${pname}" '' 
           grep "^[0-9]" | \

           sort --version-sort | \

           grep -v "funnelcake" | \

           grep -e "${lib.optionalString isBeta "b"}\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | ${

             lib.optionalString (!isBeta) "grep -v \"b\" |"

           } \

           grep -e "\([[:digit:]]\|[[:digit:]][[:digit:]]\)${versionSuffix}$" | grep -v "b" | \

           tail -1`



  curl --silent -o $HOME/shasums "$url$version/SHA256SUMS"
@@ -94,7 +86,7 @@ writeScript "update-${pname}" '' 
  }

  EOF



  mv $tmpfile ${channel}${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix

  mv $tmpfile release${if versionSuffix == "" then "" else "_${versionSuffix}"}_sources.nix



  popd

''

pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix

+0 −2
Original line number Diff line number Diff line
@@ -104,7 +104,6 @@ stdenv.mkDerivation { 
  passthru.updateScript = import ./../../browsers/firefox-bin/update.nix {

    inherit

      pname

      lib

      writeScript

      xidel

      coreutils
@@ -116,7 +115,6 @@ stdenv.mkDerivation { 
      versionSuffix

      ;

    baseName = "thunderbird";

    channel = "release";

    basePath = "pkgs/applications/networking/mailreaders/thunderbird-bin";

    baseUrl = "http://archive.mozilla.org/pub/thunderbird/releases/";

  };