From 58b50dbc90e9f6d20f3b1f139473eb56f1d6fd90 Mon Sep 17 00:00:00 2001 From: kczulko Date: Thu, 12 Jan 2023 20:34:54 +0100 Subject: [PATCH 1/5] Initial commit --- flake.lock | 59 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ flake.nix | 57 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..1027a2f --- /dev/null +++ b/flake.lock @@ -0,0 +1,59 @@ +{ + "nodes": { + "flake-utils": { + "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "nixpkgs": { + "locked": { + "lastModified": 1673531065, + "narHash": "sha256-uQIH8fM8+OVVHIIRLbh76IX2urfRtk1HfBp7U5vt9Ac=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "832bdf74072489b8da042f9769a0a2fac9b579c7", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "type": "github" + } + }, + "npmlock2nixSrc": { + "flake": false, + "locked": { + "lastModified": 1673447413, + "narHash": "sha256-sJM82Sj8yfQYs9axEmGZ9Evzdv/kDcI9sddqJ45frrU=", + "owner": "nix-community", + "repo": "npmlock2nix", + "rev": "9197bbf397d76059a76310523d45df10d2e4ca81", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "npmlock2nix", + "type": "github" + } + }, + "root": { + "inputs": { + "flake-utils": "flake-utils", + "nixpkgs": "nixpkgs", + "npmlock2nixSrc": "npmlock2nixSrc" + } + } + }, + "root": "root", + "version": 7 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..dc5367d --- /dev/null +++ b/flake.nix @@ -0,0 +1,57 @@ +{ + description = "gsts: AWS STS credentials via Google Workspace"; + + inputs = { + flake-utils.url = "github:numtide/flake-utils"; + nixpkgs.url = "github:nixos/nixpkgs"; + npmlock2nixSrc = { + url = "github:nix-community/npmlock2nix"; + flake = false; + }; + }; + + outputs = { self, nixpkgs, npmlock2nixSrc, flake-utils }: + flake-utils.lib.eachDefaultSystem (system: + let + pkgs = import nixpkgs { + inherit system; + config.allowUnfree = true; + }; + + npmlock2nix = import npmlock2nixSrc { inherit pkgs; lib = pkgs.lib; }; + + in rec { + packages.gsts = npmlock2nix.v2.build { + src = ./.; + installPhase = '' + mkdir -p $out/bin + cp -r * $out + ln -sf $out/index.js $out/bin/gsts + ''; + + node_modules_attrs = { + PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD = 1; + }; + + buildCommands = []; + }; + + defaultPackage = self.packages.${system}.gsts; + + overlays = final: prev: { + inherit (packages) gsts; + }; + + devShell = pkgs.mkShell { + + CHROMIUM_PATH = "${pkgs.chromium}/bin/chromium"; + + buildInputs = [ + defaultPackage + pkgs.chromium + pkgs.cowsay + ]; + }; + } + ); +} From 82895534da1b7e108bdde179821e4cd69a7a65b2 Mon Sep 17 00:00:00 2001 From: kczulko Date: Thu, 12 Jan 2023 20:49:15 +0100 Subject: [PATCH 2/5] README update --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index 92fe63a..26e68b9 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,12 @@ brew tap ruimarinho/tap brew install gsts ``` +### nix flakes + +```shell +nix shell github:ruimarinho/gsts +``` + ### Other Platforms Install the package via `npm`: From 708c48a4e659753b3af916a4e8b560e18fce141f Mon Sep 17 00:00:00 2001 From: kczulko Date: Thu, 12 Jan 2023 20:56:27 +0100 Subject: [PATCH 3/5] Fix devShell --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index dc5367d..fdd8c50 100644 --- a/flake.nix +++ b/flake.nix @@ -46,10 +46,9 @@ CHROMIUM_PATH = "${pkgs.chromium}/bin/chromium"; - buildInputs = [ + packages = [ defaultPackage pkgs.chromium - pkgs.cowsay ]; }; } From dd984046882f8866a49e273f8c7b2006204c695b Mon Sep 17 00:00:00 2001 From: kczulko Date: Mon, 12 Jun 2023 15:42:56 +0200 Subject: [PATCH 4/5] update dependencies --- flake.lock | 30 ++++++++++++++++++++++++------ flake.nix | 3 +++ 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index 1027a2f..f7e1165 100644 --- a/flake.lock +++ b/flake.lock @@ -1,12 +1,15 @@ { "nodes": { "flake-utils": { + "inputs": { + "systems": "systems" + }, "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "lastModified": 1685518550, + "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", "owner": "numtide", "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", "type": "github" }, "original": { @@ -17,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1673531065, - "narHash": "sha256-uQIH8fM8+OVVHIIRLbh76IX2urfRtk1HfBp7U5vt9Ac=", + "lastModified": 1686576714, + "narHash": "sha256-4Oyjb8ziwxttEEDmSVTzvtbtJTEUKDn2qLqZIfhp6m0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "832bdf74072489b8da042f9769a0a2fac9b579c7", + "rev": "328bcf4d57f14f35f2e55d6ec3283c0bc8fd6892", "type": "github" }, "original": { @@ -52,6 +55,21 @@ "nixpkgs": "nixpkgs", "npmlock2nixSrc": "npmlock2nixSrc" } + }, + "systems": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index fdd8c50..7712ddf 100644 --- a/flake.nix +++ b/flake.nix @@ -16,6 +16,9 @@ pkgs = import nixpkgs { inherit system; config.allowUnfree = true; + config.permittedInsecurePackages = [ + "nodejs-16.20.0" + ]; }; npmlock2nix = import npmlock2nixSrc { inherit pkgs; lib = pkgs.lib; }; From 2e96afaeea404f732046fa3d1f70ab5ad954a731 Mon Sep 17 00:00:00 2001 From: kczulko Date: Wed, 20 Sep 2023 09:51:34 +0200 Subject: [PATCH 5/5] Update deps --- flake.lock | 12 ++++++------ flake.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index f7e1165..42f7d07 100644 --- a/flake.lock +++ b/flake.lock @@ -5,11 +5,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1685518550, - "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=", + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", "owner": "numtide", "repo": "flake-utils", - "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", "type": "github" }, "original": { @@ -20,11 +20,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1686576714, - "narHash": "sha256-4Oyjb8ziwxttEEDmSVTzvtbtJTEUKDn2qLqZIfhp6m0=", + "lastModified": 1695194023, + "narHash": "sha256-UYkG8SIcSDNczkabVRpJ9Xq35dyFA3FsJgRucfqlIzk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "328bcf4d57f14f35f2e55d6ec3283c0bc8fd6892", + "rev": "8acedb7656bedb347dc5b6b673fa4c497a8838a1", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7712ddf..cac11c2 100644 --- a/flake.nix +++ b/flake.nix @@ -17,7 +17,7 @@ inherit system; config.allowUnfree = true; config.permittedInsecurePackages = [ - "nodejs-16.20.0" + "nodejs-16.20.2" ]; };