diff options
author | Sandro <sandro.jaeckel@gmail.com> | 2021-07-20 18:27:12 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-07-20 18:27:12 +0200 |
commit | ab5f5fb163ddc8e285c087a0e984a505ee779b77 (patch) | |
tree | f9da219a57c4e59c852fd7bd2b7d520557417649 /pkgs/applications/networking/browsers | |
parent | 0e13cd9f49764db41220637ac56c2040ee48ce07 (diff) | |
parent | e4e631ebb81da8b76f9159736b63c727c05aa4db (diff) | |
download | nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.gz nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.bz2 nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.lz nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.xz nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.tar.zst nixpkgs-ab5f5fb163ddc8e285c087a0e984a505ee779b77.zip |
Merge pull request #129359 from Stunkymonkey/app-networking
Diffstat (limited to 'pkgs/applications/networking/browsers')
4 files changed, 7 insertions, 7 deletions
diff --git a/pkgs/applications/networking/browsers/captive-browser/default.nix b/pkgs/applications/networking/browsers/captive-browser/default.nix index b302be4e013..335223883fa 100644 --- a/pkgs/applications/networking/browsers/captive-browser/default.nix +++ b/pkgs/applications/networking/browsers/captive-browser/default.nix @@ -1,9 +1,9 @@ { lib, fetchFromGitHub, buildGoPackage }: buildGoPackage rec { - name = "captive-browser"; + pname = "captive-browser"; version = "2019-04-16"; - goPackagePath = name; + goPackagePath = pname; src = fetchFromGitHub { owner = "FiloSottile"; diff --git a/pkgs/applications/networking/browsers/chromium/ungoogled.nix b/pkgs/applications/networking/browsers/chromium/ungoogled.nix index 299b19f2f4f..a8e84dae196 100644 --- a/pkgs/applications/networking/browsers/chromium/ungoogled.nix +++ b/pkgs/applications/networking/browsers/chromium/ungoogled.nix @@ -10,7 +10,7 @@ }: stdenv.mkDerivation rec { - name = "ungoogled-chromium-${version}"; + pname = "ungoogled-chromium"; version = rev; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index d16c625e2db..5ef51028136 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -80,12 +80,12 @@ let source = lib.findFirst (sourceMatches systemLocale) defaultSource sources; - name = "firefox-${channel}-bin-unwrapped-${version}"; + pname = "firefox-${channel}-bin-unwrapped"; in stdenv.mkDerivation { - inherit name; + inherit pname version; src = fetchurl { inherit (source) url sha256; }; @@ -189,7 +189,7 @@ stdenv.mkDerivation { # update with: # $ nix-shell maintainers/scripts/update.nix --argstr package firefox-bin-unwrapped passthru.updateScript = import ./update.nix { - inherit name channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; + inherit pname version channel writeScript xidel coreutils gnused gnugrep gnupg curl runtimeShell; baseUrl = if channel == "devedition" then "http://archive.mozilla.org/pub/devedition/releases/" diff --git a/pkgs/applications/networking/browsers/vivaldi/widevine.nix b/pkgs/applications/networking/browsers/vivaldi/widevine.nix index 81c95418e69..3b0dbe8e936 100644 --- a/pkgs/applications/networking/browsers/vivaldi/widevine.nix +++ b/pkgs/applications/networking/browsers/vivaldi/widevine.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "widevine"; + pname = "widevine"; version = "4.10.1582.1"; src = fetchurl { |