From a99137805474431a1224ca68b060f1c77f26e072 Mon Sep 17 00:00:00 2001 From: Miran Bastaja Date: Tue, 21 Jan 2025 10:07:08 +0100 Subject: Update dependencies, fix regressions --- config.toml | 2 +- flake.lock | 57 ++++++++++++++++++++------------------------------------- flake.nix | 16 ++++++---------- 3 files changed, 27 insertions(+), 48 deletions(-) diff --git a/config.toml b/config.toml index b880bde..a9cf441 100644 --- a/config.toml +++ b/config.toml @@ -9,7 +9,7 @@ build_search_index = false theme = "no style, please!" -generate_feed = true +generate_feeds = true [markdown] # Whether to do syntax highlighting diff --git a/flake.lock b/flake.lock index 3237e77..13680b3 100644 --- a/flake.lock +++ b/flake.lock @@ -21,11 +21,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1719994518, - "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=", + "lastModified": 1736143030, + "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7", + "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", "type": "github" }, "original": { @@ -57,11 +57,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1721743106, - "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=", + "lastModified": 1737062831, + "narHash": "sha256-Tbk1MZbtV2s5aG+iM99U8FqwxU/YNArMcWAv6clcsBc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f", + "rev": "5df43628fdf08d642be8ba5b3625a6c70731c19c", "type": "github" }, "original": { @@ -73,40 +73,24 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1719876945, - "narHash": "sha256-Fm2rDDs86sHy0/1jxTOKB1118Q0O3Uc7EC0iXvXKpbI=", + "lastModified": 1735774519, + "narHash": "sha256-CewEm1o2eVAnoqb6Ml+Qi9Gg/EfNAxbRx1lANGVyoLI=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" - } - }, - "nixpkgs-stable": { - "locked": { - "lastModified": 1720386169, - "narHash": "sha256-NGKVY4PjzwAa4upkGtAMz1npHGoRzWotlSnVlqI40mo=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "194846768975b7ad2c4988bdb82572c00222c0d7", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" + "url": "https://github.com/NixOS/nixpkgs/archive/e9b51731911566bbf7e4895475a87fe06961de0b.tar.gz" } }, "no-style-please": { "flake": false, "locked": { - "lastModified": 1710334085, - "narHash": "sha256-1rgNB7nJVkIdYLLh1h4GQ79Z+RC5LjczA8PzfiAqpVM=", + "lastModified": 1731873530, + "narHash": "sha256-67iX9Y0kSrPCyzFKDxBOL/GnorE6BKOQCj79tT3/AhY=", "owner": "atgumx", "repo": "no-style-please", - "rev": "5481a5d239dbd60ec4ad10c9c692fb0a273173a0", + "rev": "30dd31fbc558597110f373b3ef1e0c75ea350f75", "type": "gitlab" }, "original": { @@ -121,15 +105,14 @@ "gitignore": "gitignore", "nixpkgs": [ "nixpkgs" - ], - "nixpkgs-stable": "nixpkgs-stable" + ] }, "locked": { - "lastModified": 1721042469, - "narHash": "sha256-6FPUl7HVtvRHCCBQne7Ylp4p+dpP3P/OYuzjztZ4s70=", + "lastModified": 1737301351, + "narHash": "sha256-2UNmLCKORvdBRhPGI8Vx0b6l7M8/QBey/nHLIxOl4jE=", "owner": "cachix", "repo": "pre-commit-hooks.nix", - "rev": "f451c19376071a90d8c58ab1a953c6e9840527fd", + "rev": "15a87cedeb67e3dbc8d2f7b9831990dffcf4e69f", "type": "github" }, "original": { @@ -154,11 +137,11 @@ ] }, "locked": { - "lastModified": 1721769617, - "narHash": "sha256-6Pqa0bi5nV74IZcENKYRToRNM5obo1EQ+3ihtunJ014=", + "lastModified": 1737103437, + "narHash": "sha256-uPNWcYbhY2fjY3HOfRCR5jsfzdzemhfxLSxwjXYXqNc=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "8db8970be1fb8be9c845af7ebec53b699fe7e009", + "rev": "d1ed3b385f8130e392870cfb1dbfaff8a63a1899", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 2258c4c..8ebf214 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ default = config.packages.website; website = pkgs.stdenv.mkDerivation { pname = "sorre-website"; - version = "2023-11-15"; + version = "2025-01-21"; src = ./.; nativeBuildInputs = [ pkgs.zola ]; configurePhase = '' @@ -70,7 +70,7 @@ }; treefmt = { - projectRootFile = ./flake.nix; + projectRootFile = "flake.nix"; programs = { nixfmt.enable = true; }; @@ -78,14 +78,10 @@ pre-commit = { check.enable = true; - settings = { - settings = { - treefmt.package = config.treefmt.build.wrapper; - }; - hooks = { - treefmt.enable = true; - deadnix.enable = true; - }; + settings.hooks = { + treefmt.package = config.treefmt.build.wrapper; + treefmt.enable = true; + deadnix.enable = true; }; }; }; -- cgit v1.3.1