From 9a6071c3e07e171b96d5984c768bb7aba18a7f56 Mon Sep 17 00:00:00 2001 From: jared <> Date: Wed, 6 Mar 2024 23:23:27 -0700 Subject: [PATCH 1/5] Updated flake-lang.nix --- flake.lock | 7 ++++--- flake.nix | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 42a2909..6ee84eb 100644 --- a/flake.lock +++ b/flake.lock @@ -1827,15 +1827,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1707651209, - "narHash": "sha256-bVUptw8kqu1hwjMPEGFqiWAEdG2N9upTHyhV4Bpc+O8=", + "lastModified": 1709792119, + "narHash": "sha256-7L5d7l3dV5TfWATnbgzmSWc3JqtBfeyUSLLNepx/45g=", "owner": "mlabs-haskell", "repo": "flake-lang.nix", - "rev": "1c738f9a8ed77d244b47584ef265f704db0b1c5b", + "rev": "986f4eda475bf29e7eb969e7a1fa933e1d3da99b", "type": "github" }, "original": { "owner": "mlabs-haskell", + "ref": "jared/ts-tgz-to-folder", "repo": "flake-lang.nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 7d5bbcc..1a7e8b8 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks-nix.inputs.nixpkgs.follows = "nixpkgs"; hci-effects.url = "github:hercules-ci/hercules-ci-effects"; - flake-lang.url = "github:mlabs-haskell/flake-lang.nix"; + flake-lang.url = "github:mlabs-haskell/flake-lang.nix?ref=jared/ts-tgz-to-folder"; }; outputs = inputs@{ flake-parts, ... }: @@ -35,6 +35,9 @@ # Tarball of the package tgz = tsFlake.packages.prelude-typescript-tgz; + # Unpacked tarball of the package + lib = tsFlake.packages.prelude-typescript-lib; + # Documentation docs = tsFlake.packages.prelude-typescript.overrideAttrs (_self: (_super: { name = "docs"; From bee89d2150b6fc507657fd7c7f26a78a7bd6c137 Mon Sep 17 00:00:00 2001 From: jared <> Date: Thu, 7 Mar 2024 00:37:32 -0700 Subject: [PATCH 2/5] Relaxed all versions --- package.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 8e846dc..7ffbdb5 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,10 @@ "author": "Jared Pon", "license": "ISC", "devDependencies": { - "@types/node": "^20.8.10", - "fast-check": "^3.15.1", - "typedoc": "^0.25.4", - "typescript": "^5.2.2" + "@types/node": "*", + "fast-check": "*", + "typedoc": "*", + "typescript": "*" }, "files": [ "./dist/Lib/**/*", From bd842aa2d20eeacff1f69909fc51700b4c598a7c Mon Sep 17 00:00:00 2001 From: jared <> Date: Thu, 7 Mar 2024 00:38:34 -0700 Subject: [PATCH 3/5] Updated package-lock.json --- package-lock.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/package-lock.json b/package-lock.json index 97e165f..b984a4e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,10 +9,10 @@ "version": "1.0.1", "license": "ISC", "devDependencies": { - "@types/node": "^20.8.10", - "fast-check": "^3.15.1", - "typedoc": "^0.25.4", - "typescript": "^5.2.2" + "@types/node": "*", + "fast-check": "*", + "typedoc": "*", + "typescript": "*" } }, "node_modules/@types/node": { From 6b733d799986936436f89186398142e09374ec93 Mon Sep 17 00:00:00 2001 From: jared <> Date: Thu, 7 Mar 2024 03:27:04 -0700 Subject: [PATCH 4/5] Unrelaxing the versions --- package-lock.json | 8 ++++---- package.json | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/package-lock.json b/package-lock.json index b984a4e..97e165f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,10 +9,10 @@ "version": "1.0.1", "license": "ISC", "devDependencies": { - "@types/node": "*", - "fast-check": "*", - "typedoc": "*", - "typescript": "*" + "@types/node": "^20.8.10", + "fast-check": "^3.15.1", + "typedoc": "^0.25.4", + "typescript": "^5.2.2" } }, "node_modules/@types/node": { diff --git a/package.json b/package.json index 7ffbdb5..8e846dc 100644 --- a/package.json +++ b/package.json @@ -22,10 +22,10 @@ "author": "Jared Pon", "license": "ISC", "devDependencies": { - "@types/node": "*", - "fast-check": "*", - "typedoc": "*", - "typescript": "*" + "@types/node": "^20.8.10", + "fast-check": "^3.15.1", + "typedoc": "^0.25.4", + "typescript": "^5.2.2" }, "files": [ "./dist/Lib/**/*", From e8570729d253226e5c763c71156cf19fcd24f504 Mon Sep 17 00:00:00 2001 From: jared <> Date: Sat, 9 Mar 2024 02:27:59 -0700 Subject: [PATCH 5/5] Updated flake.lock --- flake.lock | 7 +++---- flake.nix | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 6ee84eb..d79e878 100644 --- a/flake.lock +++ b/flake.lock @@ -1827,16 +1827,15 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1709792119, - "narHash": "sha256-7L5d7l3dV5TfWATnbgzmSWc3JqtBfeyUSLLNepx/45g=", + "lastModified": 1709976415, + "narHash": "sha256-frWiKdgNM3cDApsEgh0OkTaEgM7hdQt64MlfqmHxD+g=", "owner": "mlabs-haskell", "repo": "flake-lang.nix", - "rev": "986f4eda475bf29e7eb969e7a1fa933e1d3da99b", + "rev": "f4b0fc29aab0b548c2dcc31fcdafc7cbe5868b59", "type": "github" }, "original": { "owner": "mlabs-haskell", - "ref": "jared/ts-tgz-to-folder", "repo": "flake-lang.nix", "type": "github" } diff --git a/flake.nix b/flake.nix index 1a7e8b8..f0067da 100644 --- a/flake.nix +++ b/flake.nix @@ -5,7 +5,7 @@ pre-commit-hooks-nix.url = "github:cachix/pre-commit-hooks.nix"; pre-commit-hooks-nix.inputs.nixpkgs.follows = "nixpkgs"; hci-effects.url = "github:hercules-ci/hercules-ci-effects"; - flake-lang.url = "github:mlabs-haskell/flake-lang.nix?ref=jared/ts-tgz-to-folder"; + flake-lang.url = "github:mlabs-haskell/flake-lang.nix"; }; outputs = inputs@{ flake-parts, ... }: