From 0957c77918358adbb2f6062001d03895c77c93eb Mon Sep 17 00:00:00 2001 From: DataHearth Date: Fri, 13 Sep 2024 11:41:32 +0200 Subject: [PATCH 1/2] nosql-workbench: lint --- pkgs/by-name/no/nosql-workbench/package.nix | 118 ++++++++++++-------- 1 file changed, 69 insertions(+), 49 deletions(-) diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index e3d1890665a5..d2f329ca5faa 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -4,26 +4,29 @@ fetchurl, jdk21, stdenv, - _7zz + _7zz, }: let pname = "nosql-workbench"; version = "3.11.0"; - src = fetchurl { - x86_64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; - }; - aarch64-darwin = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; - hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; - }; - x86_64-linux = { - url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; - hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; - }; - }.${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); + src = + fetchurl + { + x86_64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; + hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; + }; + aarch64-darwin = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; + hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; + }; + x86_64-linux = { + url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; + hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; + }; + } + .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); meta = { description = "Visual tool that provides data modeling, data visualization, and query development features to help you design, create, query, and manage DynamoDB tables"; @@ -31,49 +34,66 @@ let changelog = "https://docs.aws.amazon.com/amazondynamodb/latest/developerguide/WorkbenchDocumentHistory.html"; license = lib.licenses.unfree; maintainers = with lib.maintainers; [ DataHearth ]; - platforms = [ "aarch64-darwin" "x86_64-darwin" "x86_64-linux" ]; + platforms = [ + "aarch64-darwin" + "x86_64-darwin" + "x86_64-linux" + ]; }; in -if stdenv.isDarwin then stdenv.mkDerivation { - inherit pname version src meta; +if stdenv.isDarwin then + stdenv.mkDerivation { + inherit + pname + version + src + meta + ; - sourceRoot = "."; + sourceRoot = "."; - # DMG file is using APFS which is unsupported by "undmg". - # Instead, use "7zz" to extract the contents. - # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 - nativeBuildInputs = [ _7zz ]; + # DMG file is using APFS which is unsupported by "undmg". + # Instead, use "7zz" to extract the contents. + # "undmg" issue: https://github.com/matthewbauer/undmg/issues/4 + nativeBuildInputs = [ _7zz ]; - buildInputs = [ jdk21 ]; + buildInputs = [ jdk21 ]; - installPhase = '' - runHook preInstall + installPhase = '' + runHook preInstall - mkdir -p "$out/Applications" - mv NoSQL\ Workbench.app $out/Applications/ + mkdir -p "$out/Applications" + mv NoSQL\ Workbench.app $out/Applications/ - runHook postInstall - ''; + runHook postInstall + ''; -} else appimageTools.wrapType2 { - inherit pname version src meta; + } +else + appimageTools.wrapType2 { + inherit + pname + version + src + meta + ; - extraPkgs = pkgs: [ - # Required to run DynamoDB locally - pkgs.jdk21 - ]; + extraPkgs = pkgs: [ + # Required to run DynamoDB locally + pkgs.jdk21 + ]; - extraInstallCommands = let - appimageContents = appimageTools.extract { - inherit pname version src; - }; - in '' - # Install XDG Desktop file and its icon - install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps + extraInstallCommands = + let + appimageContents = appimageTools.extract { inherit pname version src; }; + in + '' + # Install XDG Desktop file and its icon + install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps - # Replace wrong exec statement in XDG Desktop file - substituteInPlace $out/share/applications/nosql-workbench.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' - ''; -} + # Replace wrong exec statement in XDG Desktop file + substituteInPlace $out/share/applications/nosql-workbench.desktop \ + --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' + ''; + } From a95073010f19fae349fa135799398d07129900ef Mon Sep 17 00:00:00 2001 From: DataHearth Date: Fri, 13 Sep 2024 11:56:06 +0200 Subject: [PATCH 2/2] nosql-workbench: 3.11.0 -> 3.13.0 --- pkgs/by-name/no/nosql-workbench/package.nix | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/pkgs/by-name/no/nosql-workbench/package.nix b/pkgs/by-name/no/nosql-workbench/package.nix index d2f329ca5faa..bc9532c58d94 100644 --- a/pkgs/by-name/no/nosql-workbench/package.nix +++ b/pkgs/by-name/no/nosql-workbench/package.nix @@ -8,22 +8,22 @@ }: let pname = "nosql-workbench"; - version = "3.11.0"; + version = "3.13.0"; src = fetchurl { x86_64-darwin = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-x64-${version}.dmg"; - hash = "sha256-KM3aDDsQGZwUKU/or0eOoP8okAOPH7q8KL46RwfqhzM="; + hash = "sha256-Dof1F1LTD478wh7jTR5zwFmbrvyCOWVO/C1QXTebi3c="; }; aarch64-darwin = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-mac-arm64-${version}.dmg"; - hash = "sha256-LzHiCMrDOWDuMNkkojLgKn+UG7x76wSAz0BapyWkAzU="; + hash = "sha256-QD0F6onP3GhMRIzNifx/RZkxPIS/GMtnF4zro5ygucg="; }; x86_64-linux = { url = "https://s3.amazonaws.com/nosql-workbench/NoSQL%20Workbench-linux-${version}.AppImage"; - hash = "sha256-cDOSbhAEFBHvAluxTxqVpva1GJSlFhiozzRfuM4MK5c="; + hash = "sha256-ewlaaaWxPHxaOdAMbkHChzbxAB5MNdZS/p8ROD/SvcQ="; }; } .${stdenv.system} or (throw "Unsupported system: ${stdenv.system}"); @@ -86,14 +86,15 @@ else extraInstallCommands = let appimageContents = appimageTools.extract { inherit pname version src; }; + internal_filename = "@amznnosql-workbench"; in '' # Install XDG Desktop file and its icon - install -Dm444 ${appimageContents}/nosql-workbench.desktop -t $out/share/applications - install -Dm444 ${appimageContents}/nosql-workbench.png -t $out/share/pixmaps + install -Dm444 ${appimageContents}/${internal_filename}.desktop -t $out/share/applications + install -Dm444 ${appimageContents}/${internal_filename}.png -t $out/share/pixmaps # Replace wrong exec statement in XDG Desktop file - substituteInPlace $out/share/applications/nosql-workbench.desktop \ - --replace 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' + substituteInPlace $out/share/applications/${internal_filename}.desktop \ + --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=nosql-workbench' ''; }