From 6d5580417563653f69adaf9f470a49a4ef65214d Mon Sep 17 00:00:00 2001 From: "D. Moonfire" Date: Tue, 7 Jan 2025 23:43:59 -0600 Subject: [PATCH] feat: bumping nixos and dependency packages --- .gitignore | 4 +++- .prettierignore | 9 +++++++++ CODE_OF_CONDUCT.md | 5 +++-- flake.lock | 45 +++++++++++++++++---------------------------- flake.nix | 9 +++++---- 5 files changed, 37 insertions(+), 35 deletions(-) create mode 100644 .prettierignore diff --git a/.gitignore b/.gitignore index 75a9f9e..463d6bf 100644 --- a/.gitignore +++ b/.gitignore @@ -6,4 +6,6 @@ /treefmt.toml /.prettierrc.json /lefthook.yml -/.conform.yaml \ No newline at end of file +/.conform.yaml +# mfgames-project-setup: ignore-files +/.direnv/ \ No newline at end of file diff --git a/.prettierignore b/.prettierignore new file mode 100644 index 0000000..d56e5f9 --- /dev/null +++ b/.prettierignore @@ -0,0 +1,9 @@ +.prettierignore +.editorconfig +flake.lock + +# mfgames-project-setup: ignore-files +/LICENSE.md +/DCO.md +LICENSE.md +DCO.md \ No newline at end of file diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 9b73726..ffa5dc9 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -61,6 +61,7 @@ representative at an online or offline event. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at contact@mfgames.com. + All complaints will be reviewed and investigated promptly and fairly. All community leaders are obligated to respect the privacy and security of the @@ -118,8 +119,8 @@ This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at [https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1]. -Community Impact Guidelines were inspired by -[Mozilla's code of conduct enforcement ladder][Mozilla CoC]. +Community Impact Guidelines were inspired by [Mozilla's code of conduct +enforcement ladder][Mozilla CoC]. For answers to common questions about this code of conduct, see the FAQ at [https://www.contributor-covenant.org/faq][FAQ]. Translations are available at diff --git a/flake.lock b/flake.lock index c43d133..16b99d2 100644 --- a/flake.lock +++ b/flake.lock @@ -139,14 +139,16 @@ "inputs": { "nixago": "nixago", "nixago-exts": "nixago-exts_3", - "nixpkgs": "nixpkgs" + "nixpkgs": [ + "nixpkgs" + ] }, "locked": { - "lastModified": 1706560270, - "narHash": "sha256-RgnPml2EGtHjw93pjW5gTgwM7HBv+NxgYCf9tCRtPkg=", + "lastModified": 1736314980, + "narHash": "sha256-T9zzmyTzGpLr4uWMXWZk/94aXa0gGSiSKZXSPYxDyss=", "ref": "refs/heads/main", - "rev": "b9aa1ade8865a9306024a84496e110285c409c34", - "revCount": 12, + "rev": "482b8abfa7cf339f6000763dd0997aa15e4e3d15", + "revCount": 33, "type": "git", "url": "https://src.mfgames.com/nixos-contrib/mfgames-project-setup-flake.git" }, @@ -380,36 +382,23 @@ }, "nixpkgs": { "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "revCount": 554858, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2311.554858%2Brev-a77ab169a83a4175169d78684ddd2e54486ac651/018d46f0-798f-71dc-a8c5-4689c46f7d12/source.tar.gz" + "lastModified": 1736200483, + "narHash": "sha256-JO+lFN2HsCwSLMUWXHeOad6QUxOuwe9UOAF/iSl1J4I=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "3f0a8ac25fb674611b98089ca3a5dd6480175751", + "type": "github" }, "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" - } - }, - "nixpkgs_2": { - "locked": { - "lastModified": 1706098335, - "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", - "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", - "revCount": 554858, - "type": "tarball", - "url": "https://api.flakehub.com/f/pinned/NixOS/nixpkgs/0.2311.554858%2Brev-a77ab169a83a4175169d78684ddd2e54486ac651/018d46f0-798f-71dc-a8c5-4689c46f7d12/source.tar.gz" - }, - "original": { - "type": "tarball", - "url": "https://flakehub.com/f/NixOS/nixpkgs/%2A.tar.gz" + "id": "nixpkgs", + "ref": "nixos-24.11", + "type": "indirect" } }, "root": { "inputs": { "mfgames-project-setup": "mfgames-project-setup", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs" } } }, diff --git a/flake.nix b/flake.nix index dd5a937..6989d9e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,8 +2,9 @@ description = "Common setup for mfgames-writing projects."; inputs = { - nixpkgs.url = "https://flakehub.com/f/NixOS/nixpkgs/*.tar.gz"; + nixpkgs.url = "nixpkgs/nixos-24.11"; mfgames-project-setup.url = "git+https://src.mfgames.com/nixos-contrib/mfgames-project-setup-flake.git"; + mfgames-project-setup.inputs.nixpkgs.follows = "nixpkgs"; }; outputs = inputs @ { self, nixpkgs, mfgames-project-setup, ... }: @@ -27,15 +28,15 @@ { packages = [ pkgs.pandoc - pkgs.nodejs-18_x + pkgs.nodejs_22 # EPUB pkgs.epubcheck # PDF pkgs.pdftk - pkgs.python39Full - pkgs.python39Packages.weasyprint + pkgs.python312Full + pkgs.python312Packages.weasyprint ]; }; };