summary refs log tree commit diff
path: root/pkgs/applications/networking/browsers
diff options
context:
space:
mode:
authorFelix Buehler <account@buehler.rocks>2021-07-12 12:51:53 +0200
committerFelix Buehler <account@buehler.rocks>2021-07-19 14:55:48 +0200
commite4e631ebb81da8b76f9159736b63c727c05aa4db (patch)
tree01fa83af645f1ac37347adba8c0718f580e0e81e /pkgs/applications/networking/browsers
parent62c3e45f3056c0fdf6efc05e4a87e208ed12f989 (diff)
downloadnixpkgs-e4e631ebb81da8b76f9159736b63c727c05aa4db.tar
nixpkgs-e4e631ebb81da8b76f9159736b63c727c05aa4db.tar.gz
nixpkgs-e4e631ebb81da8b76f9159736b63c727c05aa4db.tar.bz2
nixpkgs-e4e631ebb81da8b76f9159736b63c727c05aa4db.tar.lz
nixpkgs-e4e631ebb81da8b76f9159736b63c727c05aa4db.tar.xz
nixpkgs-e4e631ebb81da8b76f9159736b63c727c05aa4db.tar.zst
nixpkgs-e4e631ebb81da8b76f9159736b63c727c05aa4db.zip
applications/networking: /s/name/pname&version/
Diffstat (limited to 'pkgs/applications/networking/browsers')
-rw-r--r--pkgs/applications/networking/browsers/captive-browser/default.nix4
-rw-r--r--pkgs/applications/networking/browsers/chromium/ungoogled.nix2
-rw-r--r--pkgs/applications/networking/browsers/firefox-bin/default.nix6
-rw-r--r--pkgs/applications/networking/browsers/vivaldi/widevine.nix2
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 {