From cf4b02c04d35f09587130886fc176d965f0fb1f5 Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Fri, 4 Oct 2024 14:46:07 +0000 Subject: [PATCH 1/2] firebase-tools: 13.18.0 -> 13.20.2 --- .../tools/firebase-tools/default.nix | 43 +++++++++++-------- 1 file changed, 24 insertions(+), 19 deletions(-) diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/development/tools/firebase-tools/default.nix index ebad779c92ac..22085eb49017 100644 --- a/pkgs/development/tools/firebase-tools/default.nix +++ b/pkgs/development/tools/firebase-tools/default.nix @@ -1,33 +1,38 @@ -{ lib -, stdenv -, buildNpmPackage -, fetchFromGitHub -, python3 -, xcbuild +{ + lib, + stdenv, + buildNpmPackage, + fetchFromGitHub, + python3, + xcbuild, }: -buildNpmPackage rec { - pname = "firebase-tools"; - version = "13.18.0"; - +let + version = "13.20.2"; src = fetchFromGitHub { owner = "firebase"; repo = "firebase-tools"; - rev = "v${version}"; - hash = "sha256-Tis5bF1rVuvjSuMeoa5ayyuZXdwolkNL3Ct+IWeYOKc="; + rev = "refs/tags/v${version}"; + hash = "sha256-FIflfCSTXm7J2WectS175vc0ccztWa4tE2E2kcbhwJg="; }; +in +buildNpmPackage { + pname = "firebase-tools"; + inherit version src; - npmDepsHash = "sha256-mQYetHLbxr3Jegz01BfFVdzcLuz46zcNVqXjjxdKM/E="; + npmDepsHash = "sha256-qEerq6rFBN6HmzDS4xQJorzmzapBV/WhzCwG3rHU458="; postPatch = '' ln -s npm-shrinkwrap.json package-lock.json ''; - nativeBuildInputs = [ - python3 - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ - xcbuild - ]; + nativeBuildInputs = + [ + python3 + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + xcbuild + ]; env = { PUPPETEER_SKIP_DOWNLOAD = true; @@ -39,6 +44,6 @@ buildNpmPackage rec { homepage = "https://github.com/firebase/firebase-tools"; license = lib.licenses.mit; mainProgram = "firebase"; - maintainers = [ ]; + maintainers = with lib.maintainers; [ momeemt ]; }; } From 77328f117997dd801e7cbb8e221018b15b94062f Mon Sep 17 00:00:00 2001 From: Mutsuha Asada Date: Fri, 4 Oct 2024 14:47:18 +0000 Subject: [PATCH 2/2] firebase-tools: moved to by-name --- .../default.nix => by-name/fi/firebase-tools/package.nix} | 0 pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 2 deletions(-) rename pkgs/{development/tools/firebase-tools/default.nix => by-name/fi/firebase-tools/package.nix} (100%) diff --git a/pkgs/development/tools/firebase-tools/default.nix b/pkgs/by-name/fi/firebase-tools/package.nix similarity index 100% rename from pkgs/development/tools/firebase-tools/default.nix rename to pkgs/by-name/fi/firebase-tools/package.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4077bd7c430c..916e13bd6ba0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17690,8 +17690,6 @@ with pkgs; findnewest = callPackage ../development/tools/misc/findnewest { }; - firebase-tools = callPackage ../development/tools/firebase-tools { }; - flootty = callPackage ../development/tools/flootty { }; fffuu = haskell.lib.compose.justStaticExecutables (haskellPackages.callPackage ../tools/misc/fffuu { });