diff options
Diffstat (limited to 'nixpkgs/pkgs/applications/networking/browsers/microsoft-edge')
3 files changed, 15 insertions, 9 deletions
diff --git a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix index 7f72a42ffe0d..d6898e9d86c2 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/browser.nix @@ -52,7 +52,8 @@ let in stdenv.mkDerivation rec { - name="${baseName}-${channel}-${version}"; + pname="${baseName}-${channel}"; + inherit version; src = fetchurl { url = "https://packages.microsoft.com/repos/edge/pool/main/m/${baseName}-${channel}/${baseName}-${channel}_${version}-${revision}_amd64.deb"; @@ -181,12 +182,14 @@ stdenv.mkDerivation rec { --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.pname}-${gtk3.version}" ''; + passthru.updateScript = ./update.py; + meta = with lib; { homepage = "https://www.microsoft.com/en-us/edge"; description = "The web browser from Microsoft"; license = licenses.unfree; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ zanculmarktum kuwii ]; + maintainers = with maintainers; [ zanculmarktum kuwii rhysmdnz ]; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix index 48c3d0f68378..47163c0aa8be 100644 --- a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix +++ b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/default.nix @@ -1,20 +1,20 @@ { stable = import ./browser.nix { channel = "stable"; - version = "117.0.2045.35"; + version = "118.0.2088.46"; revision = "1"; - sha256 = "sha256-2am+TLZC024mpxOk6GLB0TZY+Kfnm/CyH8sMBLod1Js="; + sha256 = "sha256-/3lo/y/LhAmGqiOhZgDoJVS+c2631NB/Z/lBNFunU30="; }; beta = import ./browser.nix { channel = "beta"; - version = "117.0.2045.31"; + version = "118.0.2088.46"; revision = "1"; - sha256 = "sha256-Nee99jE6kswYfmZlMjv4EV4HDz1l+9YhhWHonhe2uUM="; + sha256 = "sha256-u0w7COYoAgcpqVEsB0t27iMD2AGVYFCJyE72uWKIY70="; }; dev = import ./browser.nix { channel = "dev"; - version = "118.0.2088.9"; + version = "119.0.2151.2"; revision = "1"; - sha256 = "sha256-JNIccQrdLpiEItgt4Lh0eZQgnXE+5Lx3vGDjzm5sKWM="; + sha256 = "sha256-42wbnA9i1FdBq14Y+xxstAe9ciWDzEBVMULCSURQzj0="; }; } diff --git a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py index 0e9bfa8fe89a..f32b669f0360 100755 --- a/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py +++ b/nixpkgs/pkgs/applications/networking/browsers/microsoft-edge/update.py @@ -8,6 +8,9 @@ from urllib import request from collections import OrderedDict from debian.deb822 import Packages from debian.debian_support import Version +from os.path import abspath, dirname + +PIN_PATH = dirname(abspath(__file__)) + '/default.nix' def packages(): packages_url = 'https://packages.microsoft.com/repos/edge/dists/stable/main/binary-amd64/Packages' @@ -60,7 +63,7 @@ def write_expression(): latest = latest_packages(packages()) channel_strs = nix_expressions(latest) nix_expr = '{\n' + textwrap.indent('\n'.join(channel_strs), ' ') + '\n}\n' - with open('default.nix', 'w') as f: + with open(PIN_PATH, 'w') as f: f.write(nix_expr) |