cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

Merge pull request #133246 from taku0/firefox-bin-update-script-pname

Browse source 
firefox-bin: fix parameter of updateScript
This commit is contained in:
Martin Weinelt 2021-08-09 12:19:22 +02:00 committed by GitHub
commit 689fbcb061
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkgs/applications/networking/browsers/firefox-bin/default.nix
View file

@ -187,7 +187,7 @@ stdenv.mkDerivation {
# update with: # update with:
# $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped
passthru.updateScript = import ./update.nix { passthru.updateScript = import ./update.nix {
inherit pname version channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; inherit pname channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell;
baseUrl = baseUrl =
if channel == "devedition" if channel == "devedition"
then "http://archive.mozilla.org/pub/devedition/releases/" then "http://archive.mozilla.org/pub/devedition/releases/"

4
pkgs/applications/networking/browsers/firefox-bin/update.nix
View file

@ -1,4 +1,4 @@
{ name { pname
, channel , channel
, writeScript , writeScript
, xidel , xidel
@ -17,7 +17,7 @@ let
isBeta = isBeta =
channel != "release"; channel != "release";
in writeScript "update-${name}" '' in writeScript "update-${pname}" ''
#!${runtimeShell} #!${runtimeShell}
PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin PATH=${coreutils}/bin:${gnused}/bin:${gnugrep}/bin:${xidel}/bin:${curl}/bin:${gnupg}/bin
set -eux set -eux