Skip to content

Fix updated flake lock #206

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 7 commits into from
Mar 9, 2024
Merged

Fix updated flake lock #206

merged 7 commits into from
Mar 9, 2024

Conversation

@jaredponn
Copy link
Contributor

@jaredponn jaredponn commented Mar 7, 2024 •
edited
Loading

TODO:

  • Merge the upstream changes and make the flake.nix refer to those instead of my special branches.

hercules-ci bot and others added 2 commits March 3, 2024 12:47
@hercules-ci
flake.lock: Update
c135e67 
Flake lock file updates:

• Updated input 'flake-lang':
    'github:mlabs-haskell/flake-lang.nix/5bb4fdf556a2f2f23717c654c186f13f28b9c277' (2024-02-22)
  → 'github:mlabs-haskell/flake-lang.nix/c03a156798238e67823fed7e8f5e7539ed8bceb7' (2024-02-26)
• Updated input 'flake-parts':
    'github:hercules-ci/flake-parts/b253292d9c0a5ead9bc98c4e9a26c6312e27d69f' (2024-02-01)
  → 'github:hercules-ci/flake-parts/f7b3c975cf067e56e7cda6cb098ebe3fb4d74ca2' (2024-03-01)
• Updated input 'flake-parts/nixpkgs-lib':
    'github:NixOS/nixpkgs/97b17f32362e475016f942bbdfda4a4a72a8a652?dir=lib' (2024-01-29)
  → 'github:NixOS/nixpkgs/1536926ef5621b09bba54035ae2bb6d806d72ac8?dir=lib' (2024-02-29)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/3a6f583ce593c1960e7149ab4f8af055a400bb41' (2024-02-25)
  → 'github:NixOS/nixpkgs/c49282e5a7c4df5035940acef59e39ce82257787' (2024-03-03)
• Updated input 'plutus-ledger-api-typescript':
    'github:mlabs-haskell/plutus-ledger-api-typescript/3c78696686c9da55d145a6328204bf7a74cc39de' (2024-02-21)
  → 'github:mlabs-haskell/plutus-ledger-api-typescript/38038ff008b89c718a19a8b9a18b7eb4dc7358af' (2024-03-02)
• Updated input 'plutus-ledger-api-typescript/hci-effects':
    'github:hercules-ci/hercules-ci-effects/d5cbf433a6ae9cae05400189a8dbc6412a03ba16' (2023-12-31)
  → 'github:hercules-ci/hercules-ci-effects/0ca27bd58e4d5be3135a4bef66b582e57abe8f4a' (2024-02-21)
• Updated input 'plutus-ledger-api-typescript/nixpkgs':
    'github:NixOS/nixpkgs/f33dd27a47ebdf11dc8a5eb05e7c8fbdaf89e73f' (2024-02-20)
  → 'github:NixOS/nixpkgs/d53c2037394da6fe98decca417fc8fda64bf2443' (2024-02-28)
• Updated input 'plutus-ledger-api-typescript/prelude-typescript':
    'github:mlabs-haskell/prelude-typescript/f4967283b5019f7d5233e686dfb52a50fb2d6090' (2024-02-21)
  → 'github:mlabs-haskell/prelude-typescript/ff809e8427f7528d4e22a0e23ed031c93199102e' (2024-02-29)
DRAFT: Fix TS issues when updating
f2ff69a
@jaredponn jaredponn mentioned this pull request Mar 7, 2024
Closed
bladyjoker
bladyjoker approved these changes Mar 7, 2024
View reviewed changes
Copy link
Contributor

@bladyjoker bladyjoker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Left a comment for package-lock.json.

Additionally, you removed the version from the dependency filenames, I'm curious to hear why? Rust has them, Ts doesn't we're very misaligned here and would like to have a coherent story on what makes sense.

@jaredponn
Copy link
Contributor Author

jaredponn commented Mar 7, 2024 •
edited
Loading

Additionally, you removed the version from the dependency filenames, I'm curious to hear why?

Indeed, they were originally there because when packaging everything up as tarballs, npm put them there automatically as part of its packing process.

Now, switching to folders, npm does not put them there automatically, and similar commands in npm don't include the version name when linking them -- see npm link.

Would we prefer to have them? This has the downside of an update on nix now requires manually patching every package-lock.json file in the system. Which might be a good idea actually.

Rust has them, Ts doesn't we're very misaligned here and would like to have a coherent story on what makes sense.

See above. NPM doesn't include it by default with these folder dependencies with npm link

@jaredponn jaredponn marked this pull request as ready for review March 7, 2024 22:12
@bladyjoker bladyjoker self-requested a review March 8, 2024 11:17
bladyjoker
bladyjoker approved these changes Mar 8, 2024
View reviewed changes
Copy link
Contributor

@bladyjoker bladyjoker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sounds reasonable to me, I actually like that we can manage package version from the outside.

@jaredponn jaredponn added this pull request to the merge queue Mar 9, 2024
Merged via the queue into main with commit 56935e5 Mar 9, 2024
@jaredponn jaredponn deleted the jared/fix-updated-flake-lock branch March 9, 2024 09:53
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

1 more reviewer

@bladyjoker bladyjoker bladyjoker approved these changes

Reviewers whose approvals may not affect merge requirements

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@jaredponn @bladyjoker