From d06b64a4dd8be345c663969d910579f8982b3c32 Mon Sep 17 00:00:00 2001 From: teutat3s <teutates@mailbox.org> Date: Wed, 5 Feb 2025 21:56:38 -0300 Subject: [PATCH] matrix-authentication-service: early update to 0.13.0 https://github.com/NixOS/nixpkgs/pull/374272 --- flake.lock | 25 +++++++++++++++++++++---- flake.nix | 3 ++- overlays/default.nix | 2 ++ 3 files changed, 25 insertions(+), 5 deletions(-) diff --git a/flake.lock b/flake.lock index 07aae0c..7d9b764 100644 --- a/flake.lock +++ b/flake.lock @@ -236,16 +236,32 @@ }, "fork": { "locked": { - "lastModified": 1729963002, - "narHash": "sha256-2zrYfd/qdfExU5zVwvH80uJnKc/dMeK6zp3O1UtW2Mo=", + "lastModified": 1738811633, + "narHash": "sha256-TEORPygNjNpSVfpLVLvq7GpPvMwAAIPwUOvO6ja6uHc=", "owner": "teutat3s", "repo": "nixpkgs", - "rev": "005faaacbeede0296dec5c844f508027ab8a3ff6", + "rev": "dd78c61c67e49528c4f09b3aa6398413a9409186", "type": "github" }, "original": { "owner": "teutat3s", - "ref": "init-matrix-authentication-service-module", + "ref": "init-matrix-authentication-service-module-0.13.0", + "repo": "nixpkgs", + "type": "github" + } + }, + "fork-mas-update": { + "locked": { + "lastModified": 1738798962, + "narHash": "sha256-T7LN7okChu/LBwkr9rAdVgkfV2SbwHJbxvHC8Md1x8E=", + "owner": "teutat3s", + "repo": "nixpkgs", + "rev": "9a3b373d88807f6ea9db45e29e186b0917a0005d", + "type": "github" + }, + "original": { + "owner": "teutat3s", + "ref": "mas-0.13.0", "repo": "nixpkgs", "type": "github" } @@ -371,6 +387,7 @@ "element-themes": "element-themes", "flake-parts": "flake-parts", "fork": "fork", + "fork-mas-update": "fork-mas-update", "home-manager": "home-manager", "keycloak-theme-pub-solar": "keycloak-theme-pub-solar", "maunium-stickerpicker": "maunium-stickerpicker", diff --git a/flake.nix b/flake.nix index c7f18a6..91a6aa0 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,8 @@ # Track channels with commits tested and built by hydra nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11"; unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - fork.url = "github:teutat3s/nixpkgs/init-matrix-authentication-service-module"; + fork.url = "github:teutat3s/nixpkgs/init-matrix-authentication-service-module-0.13.0"; + fork-mas-update.url = "github:teutat3s/nixpkgs/mas-0.13.0"; nix-darwin.url = "github:lnl7/nix-darwin/master"; nix-darwin.inputs.nixpkgs.follows = "nixpkgs"; diff --git a/overlays/default.nix b/overlays/default.nix index af9faa9..fc68dba 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -10,8 +10,10 @@ final: prev: let unstable = import inputs.unstable { system = prev.system; }; + fork-mas-update = import inputs.fork-mas-update { system = prev.system; }; in { + matrix-authentication-service = fork-mas-update.matrix-authentication-service; element-themes = prev.callPackage ./pkgs/element-themes { inherit (inputs) element-themes; }; element-stickerpicker = prev.callPackage ./pkgs/element-stickerpicker { inherit (inputs) element-stickers maunium-stickerpicker;