diff --git a/dragonwell/mealie.nix b/dragonwell/mealie.nix index fd9b859026ad19acd81b3ecf8377e820929906d4..a5a6b94468cc818d6ecd04fc4afcfe86a8abbb45 100644 --- a/dragonwell/mealie.nix +++ b/dragonwell/mealie.nix @@ -4,13 +4,11 @@ age.secrets.mealie.file = ../secrets/mealie.age; services.mealie = { enable = true; # TODO remove this hack once mealie tests work again - package = pkgs.mealie.overrideAttrs ( - _: _: { - doCheck = false; - checkPhase = ''echo "Skipping tests for mealie"''; - installCheckPhase = ''echo "Skipping install tests for mealie"''; - } - ); + package = pkgs.mealie.override { + doCheck = false; + checkPhase = ''echo "Skipping tests for mealie"''; + installCheckPhase = ''echo "Skipping install tests for mealie"''; + }; listenAddress = "localhost"; port = 3663; settings = { diff --git a/flake.lock b/flake.lock index 20cb82fd0dd2fc73905a4a879ce0cf322232a061..24274bf1faa35ad4b2ee7bb28e3c7bb129507c4d 100644 --- a/flake.lock +++ b/flake.lock @@ -46,11 +46,11 @@ "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1781188389, - "narHash": "sha256-MS3szDFuYq+zbmseCsLFOkSDM3QsguiVClQDeSViizo=", + "lastModified": 1763398077, + "narHash": "sha256-tjDuYxRSkifd7b6aFYqsWmKJCiMV/I9GxxxDcKlHpBQ=", "ref": "refs/heads/main", - "rev": "6dad0e7b287208e9dcccc3f070b063cb18dc829e", - "revCount": 33, + "rev": "d94f0aa1c8ac3b12479dfb8721c3ab4835aed42e", + "revCount": 32, "type": "git", "url": "https://git.jolheiser.com/blog.git" }, @@ -120,11 +120,11 @@ "inputs": { "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1778746725, - "narHash": "sha256-Okv5rnIBFaXShyg1h4hsDA7Fs4bKEmcSKPQQf1HR5Rc=", + "lastModified": 1777823843, + "narHash": "sha256-sYEhb/ME1lxrMR5KJD8+rkMGwyd73e/9bScAVkqO7AE=", "owner": "reckenrode", "repo": "nix-foundryvtt", - "rev": "db075efec1947c593c237af6f0a8629ca8709bf1", + "rev": "12ef973babb19874906cc2480a6f724e0a5ac89e", "type": "github" }, "original": { @@ -222,11 +222,11 @@ "nixpkgs": "nixpkgs_8", "systems": "systems_2" }, "locked": { - "lastModified": 1781286750, - "narHash": "sha256-trvhW+Z3uRS4YLV5r9Wd2MTcyFHvSsgSRF1xV6nB1kc=", + "lastModified": 1777992933, + "narHash": "sha256-b+eN1E5PAQVexQ9+uDxdGrM5aGsz9hpUNuircAb0bmo=", "owner": "tailscale", "repo": "golink", - "rev": "50d56257a80c781c9cda581b284ffd2bd1847ec4", + "rev": "b85eec3e0ed734380a61b31782b72818f214c494", "type": "github" }, "original": { @@ -240,11 +240,11 @@ "inputs": { "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1781667738, - "narHash": "sha256-OxrwHpsWf+QGbos1LMDGAcv7sjBGshcw/43th6waeYI=", + "lastModified": 1778594112, + "narHash": "sha256-VA9z90SZviIvOcA4QyatA48FIyqb8mmsmH/EsXXWAG4=", "owner": "nix-community", "repo": "home-manager", - "rev": "7664e05e2413d5e2b8c54a884eb8ea0f8a504fc2", + "rev": "1768d4e49860b86cb7652ee738de0e6b3050dd40", "type": "github" }, "original": { @@ -307,15 +307,12 @@ "url": "https://git.jolheiser.com/mint.git" } }, "nixos-hardware": { - "inputs": { - "nixpkgs": "nixpkgs_13" - }, "locked": { - "lastModified": 1781622756, - "narHash": "sha256-JrPh4M6S7aPsEE9tOENuZrxC6o2szSLlK+t4+nLke9s=", + "lastModified": 1778593042, + "narHash": "sha256-xYGrSg6354UK2K4WSQd4+TfyvfqmvFbSY+ZtGQUXK0c=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "08018c72174a4df5657f8d94178ac69fb9c243e5", + "rev": "9bd7c80d43e258aaa607d83b43661df11444d808", "type": "github" }, "original": { @@ -404,24 +401,11 @@ } }, "nixpkgs_13": { "locked": { - "lastModified": 1767892417, - "narHash": "sha256-8bW3q88CEg2u4hSP66Vf4lpbLonHz7hqDNBMcCY7E9U=", - "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", - "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.05pre924538.3497aa5c9457/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_14": { - "locked": { - "lastModified": 1781577229, - "narHash": "sha256-lrp67w8AulE9Ks53n27I45ADSzbOCn4H+CNW1Ck8B+8=", + "lastModified": 1777954456, + "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "567a49d1913ce81ac6e9582e3553dd90a955875f", + "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1", "type": "github" }, "original": { @@ -431,7 +415,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_15": { + "nixpkgs_14": { "locked": { "lastModified": 1752012998, "narHash": "sha256-Q82Ms+FQmgOBkdoSVm+FBpuFoeUAffNerR5yVV7SgT8=", @@ -447,7 +431,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_16": { + "nixpkgs_15": { "locked": { "lastModified": 1697383814, "narHash": "sha256-NoGJsi8R4GyQX6GHJS9lIXyrbrybqyqA8v6HVixHs5E=", @@ -462,13 +446,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_17": { + "nixpkgs_16": { "locked": { - "lastModified": 1754800730, - "narHash": "sha256-HfVZCXic9XLBgybP0318ym3cDnGwBs/+H5MgxFVYF4I=", + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "641d909c4a7538f1539da9240dedb1755c907e40", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", "type": "github" }, "original": { @@ -478,13 +462,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_18": { + "nixpkgs_17": { "locked": { - "lastModified": 1779560665, - "narHash": "sha256-tpyBcxPpcQb8ukyNF7DoCwfSY3VPsxHoYwj00Cayv5o=", + "lastModified": 1769018530, + "narHash": "sha256-MJ27Cy2NtBEV5tsK+YraYr2g851f3Fl1LpNHDzDX15c=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "64c08a7ca051951c8eae34e3e3cb1e202fe36786", + "rev": "88d3861acdd3d2f0e361767018218e51810df8a1", "type": "github" }, "original": { @@ -493,7 +477,7 @@ "ref": "nixos-unstable", "type": "indirect" } }, - "nixpkgs_19": { + "nixpkgs_18": { "locked": { "lastModified": 1776949667, "narHash": "sha256-GMSVw35Q+294GlrTUKlx087E31z7KurReQ1YHSKp5iw=", @@ -509,13 +493,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_2": { + "nixpkgs_19": { "locked": { - "lastModified": 1763312402, - "narHash": "sha256-3YJkOBrFpmcusnh7i8GXXEyh7qZG/8F5z5+717550Hk=", + "lastModified": 1747060738, + "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", "owner": "nixos", "repo": "nixpkgs", - "rev": "85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1", + "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", "type": "github" }, "original": { @@ -525,13 +509,13 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_20": { + "nixpkgs_2": { "locked": { - "lastModified": 1747060738, - "narHash": "sha256-ByfPRQuqj+nhtVV0koinEpmJw0KLzNbgcgi9EF+NVow=", + "lastModified": 1763312402, + "narHash": "sha256-3YJkOBrFpmcusnh7i8GXXEyh7qZG/8F5z5+717550Hk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eaeed9530c76ce5f1d2d8232e08bec5e26f18ec1", + "rev": "85a6c4a07faa12aaccd81b36ba9bfc2bec974fa1", "type": "github" }, "original": { @@ -541,7 +525,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_21": { + "nixpkgs_20": { "locked": { "lastModified": 1753399495, "narHash": "sha256-7XG/QBqhrYOyA2houjRTL2NMa7IKZZ/somBqr+Q/6Wo=", @@ -557,7 +541,7 @@ "repo": "nixpkgs", "type": "github" } }, - "nixpkgs_22": { + "nixpkgs_21": { "locked": { "lastModified": 1699343069, "narHash": "sha256-s7BBhyLA6MI6FuJgs4F/SgpntHBzz40/qV0xLPW6A1Q=", @@ -670,23 +654,23 @@ } }, "nixpkgs_9": { "locked": { - "lastModified": 1780365719, - "narHash": "sha256-QfWfccTN+70ZQ4m2qlU9PiKfz2Yppq94058iJyARNwc=", + "lastModified": 1777268161, + "narHash": "sha256-bxrdOn8SCOv8tN4JbTF/TXq7kjo9ag4M+C8yzzIRYbE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ffa10e26ae11d676b2db836259889f1f571cb14f", + "rev": "1c3fe55ad329cbcb28471bb30f05c9827f724c76", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixpkgs-unstable", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "oidc": { "inputs": { - "nixpkgs": "nixpkgs_15" + "nixpkgs": "nixpkgs_14" }, "locked": { "lastModified": 1752529116, @@ -704,7 +688,7 @@ } }, "resume": { "inputs": { - "nixpkgs": "nixpkgs_16" + "nixpkgs": "nixpkgs_15" }, "locked": { "lastModified": 1753062776, @@ -736,7 +720,7 @@ "horcrux": "horcrux", "mazanoke": "mazanoke", "mint": "mint", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_14", + "nixpkgs": "nixpkgs_13", "oidc": "oidc", "resume": "resume", "tailproxy": "tailproxy", @@ -792,20 +776,20 @@ } }, "tailproxy": { "inputs": { - "nixpkgs": "nixpkgs_17" + "nixpkgs": "nixpkgs_16" }, "locked": { - "lastModified": 1781704127, - "narHash": "sha256-tKOg/NE/k1QnXosy8aN9/o309HjuBVyAvnR9TxN6eL4=", + "lastModified": 1755099374, + "narHash": "sha256-oGONZWSA/mZEVgQCVHGqXxMkL6vpqZ5lW07gbBYv3eA=", "ref": "refs/heads/main", - "rev": "db9a49f93b3016570cf4aa9342125b1f2a07ac71", - "revCount": 8, + "rev": "1ca4b8b4364e998aae11953db613911b580b76f1", + "revCount": 13, "type": "git", - "url": "https://git.jolheiser.com/tailroute.git" + "url": "https://git.jolheiser.com/tailproxy.git" }, "original": { "type": "git", - "url": "https://git.jolheiser.com/tailroute.git" + "url": "https://git.jolheiser.com/tailproxy.git" } }, "tailwind-ctp": { @@ -852,7 +836,7 @@ } }, "tailwind-ctp-lsp_2": { "inputs": { - "nixpkgs": "nixpkgs_22" + "nixpkgs": "nixpkgs_21" }, "locked": { "lastModified": 1699401590, @@ -870,7 +854,7 @@ } }, "tailwind-ctp_2": { "inputs": { - "nixpkgs": "nixpkgs_21" + "nixpkgs": "nixpkgs_20" }, "locked": { "lastModified": 1753803577, @@ -888,15 +872,15 @@ } }, "tclip": { "inputs": { - "nixpkgs": "nixpkgs_18", + "nixpkgs": "nixpkgs_17", "utils": "utils" }, "locked": { - "lastModified": 1781700032, - "narHash": "sha256-JrPHjTmWLr3yksgcbN00kvz2y1cME3RMrcTG5JDo58Q=", + "lastModified": 1773071635, + "narHash": "sha256-mCjc+3zTj68vuw1Fi2hALbZm1S/HcI4x+Fo3/GI1RbI=", "owner": "tailscale-dev", "repo": "tclip", - "rev": "b547409b9c857fb59dd6d601d35c9fb88929ed0a", + "rev": "c460fa2d9f9e91d81cd85eadae6dbc98326f3894", "type": "github" }, "original": { @@ -907,7 +891,7 @@ } }, "ugit": { "inputs": { - "nixpkgs": "nixpkgs_19", + "nixpkgs": "nixpkgs_18", "tailwind-ctp": "tailwind-ctp", "tailwind-ctp-lsp": "tailwind-ctp-lsp" }, @@ -945,7 +929,7 @@ } }, "website": { "inputs": { - "nixpkgs": "nixpkgs_20", + "nixpkgs": "nixpkgs_19", "tailwind-ctp": "tailwind-ctp_2", "tailwind-ctp-lsp": "tailwind-ctp-lsp_2" }, diff --git a/flake.nix b/flake.nix index 73e690b4f8ca32ea4ba1abed71c5b94da029ea52..52460a77f4888500dc58584974acfafb0e873af3 100644 --- a/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ # Other flakes golink.url = "github:tailscale/golink"; tclip.url = "github:tailscale-dev/tclip"; foundry.url = "github:reckenrode/nix-foundryvtt"; - tailproxy.url = "git+https://git.jolheiser.com/tailroute.git"; + tailproxy.url = "git+https://git.jolheiser.com/tailproxy.git"; forge-lines.url = "git+https://code.winston.sh/winston/forge-lines.git"; mazanoke.url = "github:jolheiser/mazanoke-nix"; };