From 477ac02fd0e32ed4f6274835eef1dd103eb40ae8 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 17 Jan 2026 14:21:16 -0500 Subject: [PATCH] use master branch --- clients/quadraticserver/docs/default.nix | 8 ++--- flake.lock | 40 +++++++----------------- flake.nix | 1 - 3 files changed, 16 insertions(+), 33 deletions(-) diff --git a/clients/quadraticserver/docs/default.nix b/clients/quadraticserver/docs/default.nix index 2a30b3c..ae65055 100644 --- a/clients/quadraticserver/docs/default.nix +++ b/clients/quadraticserver/docs/default.nix @@ -14,7 +14,7 @@ in ]; imports = [ inputs.lasuite-docs-proxy.nixosModules.default - "${inputs.nixpkgs-lasuite}/nixos/modules/services/web-apps/lasuite-docs.nix" + "${inputs.nixpkgs-master}/nixos/modules/services/web-apps/lasuite-docs.nix" ]; systemd.services = { @@ -54,17 +54,17 @@ in redis.createLocally = true; postgresql.createLocally = true; backendPackage = - inputs.nixpkgs-lasuite.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs.overrideAttrs + inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs.overrideAttrs (old: { patches = (old.patches or [ ]) ++ [ ./enable-languages.patch ]; }); frontendPackage = - inputs.nixpkgs-lasuite.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-frontend.overrideAttrs + inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-frontend.overrideAttrs { NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; }; collaborationServer.package = - inputs.nixpkgs-lasuite.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-collaboration-server; + inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.lasuite-docs-collaboration-server; bind = "unix:${socket}"; inherit s3Url domain; diff --git a/flake.lock b/flake.lock index dd430b3..78435fe 100644 --- a/flake.lock +++ b/flake.lock @@ -1199,11 +1199,11 @@ ] }, "locked": { - "lastModified": 1768325819, - "narHash": "sha256-mBKqOJkxCRwEhIXfq93WTcDXsBlJ/f1Dfv9thJxrDPs=", + "lastModified": 1768598210, + "narHash": "sha256-kkgA32s/f4jaa4UG+2f8C225Qvclxnqs76mf8zvTVPg=", "owner": "nix-community", "repo": "home-manager", - "rev": "b1fa714d6cd656e3105d1965637be6ab7541d7d7", + "rev": "c47b2cc64a629f8e075de52e4742de688f930dc6", "type": "github" }, "original": { @@ -2125,11 +2125,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1768127708, - "narHash": "sha256-1Sm77VfZh3mU0F5OqKABNLWxOuDeHIlcFjsXeeiPazs=", + "lastModified": 1768564909, + "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ffbc9f8cbaacfb331b6017d5a5abb21a492c9a38", + "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f", "type": "github" }, "original": { @@ -2155,21 +2155,6 @@ "type": "github" } }, - "nixpkgs-lasuite": { - "locked": { - "lastModified": 1768663811, - "narHash": "sha256-yLh+eSqrsDL9ITH6WmVfcOv9GkABaIkocZ9DkR6dBac=", - "owner": "Henry-Hiles", - "repo": "nixpkgs", - "rev": "950f864b43d347f211cb5df74ead1c0bce2b4e97", - "type": "github" - }, - "original": { - "owner": "Henry-Hiles", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-latest": { "locked": { "lastModified": 1752336159, @@ -2278,11 +2263,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1768659755, - "narHash": "sha256-QLZVje0QuaTtt59qrg9/eGYgq4Xmfnp9Rct67l0+vms=", + "lastModified": 1768676937, + "narHash": "sha256-7G8FI1JVvSSj9I4r6EHuZfNp9QafzW1gtiSvpXPa0Yo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e56d3f4ff61f60002f239d7b06de4cd9c389bb47", + "rev": "8f73eb3044e416e8f6f92ffd91e9b1108c354751", "type": "github" }, "original": { @@ -2575,7 +2560,6 @@ "nix-maid": "nix-maid", "nix-matrix-appservices": "nix-matrix-appservices", "nixpkgs": "nixpkgs", - "nixpkgs-lasuite": "nixpkgs-lasuite", "nixpkgs-master": "nixpkgs-master", "run0-sudo-shim": "run0-sudo-shim", "sdm845": "sdm845", @@ -2808,11 +2792,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1768241331, - "narHash": "sha256-li0Z2Tr5qpH+wyuCMpzXSsHYRleaTukcdLTpAsGcVzY=", + "lastModified": 1768603455, + "narHash": "sha256-ih6dYNhX1oSg0emfSAvf3iRcgsJtMmS6RUaoCX8kNoU=", "owner": "danth", "repo": "stylix", - "rev": "a62840a9e95801969a03b91e49c1607b5322224c", + "rev": "590e5c68c4d5e8c766420473c0185d75113f653b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index f3ba1d7..175496f 100755 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,6 @@ gnome-mobile.url = "github:chuangzhu/nixpkgs-gnome-mobile"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-master.url = "github:nixos/nixpkgs"; - nixpkgs-lasuite.url = "github:Henry-Hiles/nixpkgs"; wrapper-manager.url = "github:viperML/wrapper-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; nix-maid.url = "github:viperML/nix-maid";