element-desktop: 1.11.87 -> 1.11.89, element-{web,desktop}: move to pkgs/by-name, format (#365951)

Author: khaneliman

pkgs/applications/networking/instant-messengers/element/element-web.nix

@@ -0,0 +1,7 @@
+{
+  "version" = "1.11.89";
+  "hashes" = {
+    "desktopSrcHash" = "sha256-vZLM1AIMxDltB+GeQEcYifnaBC1+4wWkotPFuelHxT0=";
+    "desktopYarnHash" = "1n057ic4dzcyg3wfr8jj7vab00jg2d1m38y5zk1kab1pka163f1q";
+  };
+}

pkgs/applications/networking/instant-messengers/element/pin.nix

@@ -8,8 +8,6 @@
   pkg-config,
   libsecret,
   xcbuild,
-  Security,
-  AppKit,
   fetchNpmDeps,
   npmHooks,
 }:
@@ -36,12 +34,7 @@ stdenv.mkDerivation rec {
     npmHooks.npmConfigHook
   ] ++ lib.optional stdenv.hostPlatform.isDarwin xcbuild;
 
-  buildInputs =
-    lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ]
-    ++ lib.optionals stdenv.hostPlatform.isDarwin [
-      Security
-      AppKit
-    ];
+  buildInputs = lib.optionals (!stdenv.hostPlatform.isDarwin) [ libsecret ];
 
   npmDeps = fetchNpmDeps {
     inherit src;

pkgs/by-name/el/element-desktop/element-desktop-pin.nix

@@ -13,21 +13,18 @@
   element-web,
   sqlcipher,
   callPackage,
-  Security,
-  AppKit,
-  CoreServices,
   desktopToDarwinBundle,
   useKeytar ? true,
   # command line arguments which are always set
   commandLineArgs ? "",
 }:
 
 let
-  pinData = import ./pin.nix;
+  pinData = import ./element-desktop-pin.nix;
   inherit (pinData.hashes) desktopSrcHash desktopYarnHash;
   executableName = "element-desktop";
-  keytar = callPackage ./keytar { inherit Security AppKit; };
-  seshat = callPackage ./seshat { inherit CoreServices; };
+  keytar = callPackage ./keytar { };
+  seshat = callPackage ./seshat { };
   electron = electron_33;
 in
 stdenv.mkDerivation (
@@ -146,6 +143,7 @@ stdenv.mkDerivation (
     '';
 
     passthru = {
+      # run with: nix-shell ./maintainers/scripts/update.nix --argstr package element-desktop
       updateScript = ./update.sh;
 
       # TL;DR: keytar is optional while seshat isn't.

…nt-messengers/element/keytar/default.nix …me/el/element-desktop/keytar/default.nixpkgs/applications/networking/instant-messengers/element/keytar/default.nix renamed to pkgs/by-name/el/element-desktop/keytar/default.nix pkgs/applications/networking/instant-messengers/element/keytar/default.nix renamed to pkgs/by-name/el/element-desktop/keytar/default.nix

@@ -3,13 +3,11 @@
   stdenv,
   rustPlatform,
   fetchFromGitHub,
-  rust,
   sqlcipher,
   nodejs,
   python3,
   yarn,
   fixup-yarn-lock,
-  CoreServices,
   fetchYarnDeps,
   removeReferencesTo,
 }:
@@ -37,7 +35,7 @@ rustPlatform.buildRustPackage rec {
     yarn
     fixup-yarn-lock
   ];
-  buildInputs = [ sqlcipher ] ++ lib.optional stdenv.hostPlatform.isDarwin CoreServices;
+  buildInputs = [ sqlcipher ];
 
   npm_config_nodedir = nodejs;