about summary refs log tree commit diff
diff options
context:
space:
mode:
m---------ArcaneLibs0
-rw-r--r--LibMatrix.Federation/deps.json5
-rw-r--r--LibMatrix/deps.json5
-rw-r--r--Utilities/LibMatrix.Utilities.Bot/deps.json5
-rw-r--r--flake.lock12
-rw-r--r--flake.nix18
6 files changed, 15 insertions, 30 deletions
diff --git a/ArcaneLibs b/ArcaneLibs
-Subproject 491a3c65481c4e5a41b4435106e3dc8ba81efdc
+Subproject 270012a7527345a914003c98bf97c7b221812cc
diff --git a/LibMatrix.Federation/deps.json b/LibMatrix.Federation/deps.json

index edecdc2..6c90cd1 100644 --- a/LibMatrix.Federation/deps.json +++ b/LibMatrix.Federation/deps.json
@@ -1,10 +1,5 @@ [ { - "pname": "ArcaneLibs", - "version": "1.0.0-preview.20251205-114150", - "hash": "sha256-OFH86NaYdaHhNjvwMzamKO6xz1HuXZAO0pVon8FFnzA=" - }, - { "pname": "BouncyCastle.Cryptography", "version": "2.6.2", "hash": "sha256-Yjk2+x/RcVeccGOQOQcRKCiYzyx1mlFnhS5auCII+Ms=" diff --git a/LibMatrix/deps.json b/LibMatrix/deps.json
index 0fbc71d..ce0dfbf 100644 --- a/LibMatrix/deps.json +++ b/LibMatrix/deps.json
@@ -1,10 +1,5 @@ [ { - "pname": "ArcaneLibs", - "version": "1.0.0-preview.20251205-114150", - "hash": "sha256-OFH86NaYdaHhNjvwMzamKO6xz1HuXZAO0pVon8FFnzA=" - }, - { "pname": "Microsoft.Extensions.DependencyInjection.Abstractions", "version": "10.0.0", "hash": "sha256-9iodXP39YqgxomnOPOxd/mzbG0JfOSXzFoNU3omT2Ps=" diff --git a/Utilities/LibMatrix.Utilities.Bot/deps.json b/Utilities/LibMatrix.Utilities.Bot/deps.json
index 4d5a0c8..566f6a9 100644 --- a/Utilities/LibMatrix.Utilities.Bot/deps.json +++ b/Utilities/LibMatrix.Utilities.Bot/deps.json
@@ -1,10 +1,5 @@ [ { - "pname": "ArcaneLibs", - "version": "1.0.0-preview.20251205-114150", - "hash": "sha256-OFH86NaYdaHhNjvwMzamKO6xz1HuXZAO0pVon8FFnzA=" - }, - { "pname": "Microsoft.Extensions.Configuration", "version": "10.0.0", "hash": "sha256-MsLskVPpkCvov5+DWIaALCt1qfRRX4u228eHxvpE0dg=" diff --git a/flake.lock b/flake.lock
index 917a7a3..d70f9b9 100644 --- a/flake.lock +++ b/flake.lock
@@ -8,11 +8,11 @@ ] }, "locked": { - "lastModified": 1764934856, - "narHash": "sha256-ypuVuTHImU2JkzgkFmV4Z4AVNoz4yQAPkCbP5opo464=", + "lastModified": 1765126047, + "narHash": "sha256-c+IuteUQJI9Apm4z64XjEXZZyJS62THHmmceftYb6xk=", "owner": "TheArcaneBrony", "repo": "ArcaneLibs", - "rev": "491a3c65481c4e5a41b4435106e3dc8ba81efdc3", + "rev": "270012a7527345a914003c98bf97c7b221812cc1", "type": "github" }, "original": { @@ -59,11 +59,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1764667669, - "narHash": "sha256-7WUCZfmqLAssbDqwg9cUDAXrSoXN79eEEq17qhTNM/Y=", + "lastModified": 1764950072, + "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "418468ac9527e799809c900eda37cbff999199b6", + "rev": "f61125a668a320878494449750330ca58b78c557", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix
index 45a0b4b..03becfa 100644 --- a/flake.nix +++ b/flake.nix
@@ -19,7 +19,7 @@ date = builtins.substring 0 8 self.sourceInfo.lastModifiedDate; time = builtins.substring 8 6 self.sourceInfo.lastModifiedDate; in - "preview.${date}-${time}+${rev}"; + "preview.${date}-${time}"; # +${rev}"; makeNupkg = { @@ -56,14 +56,14 @@ let # HACKHACK: trim version string until nuget learns to deal with semver properly # See: https://github.com/NuGet/Home/issues/14628 - ArcaneLibs = arcanelibs.packages."${pkgs.stdenv.hostPlatform.system}".ArcaneLibs.overrideAttrs (old: { - __intentionallyOverridingVersion = true; - version = builtins.substring 0 29 old.version; # "1.0.0-preview-20251106-123456"; - }); - LibMatrix = self.packages."${pkgs.stdenv.hostPlatform.system}".LibMatrix.overrideAttrs (old: { - __intentionallyOverridingVersion = true; - version = builtins.substring 0 29 old.version; # "1.0.0-preview-20251106-123456"; - }); + ArcaneLibs = arcanelibs.packages."${pkgs.stdenv.hostPlatform.system}".ArcaneLibs; #.overrideAttrs (old: { + # __intentionallyOverridingVersion = true; + # version = builtins.substring 0 29 old.version; # "1.0.0-preview-20251106-123456"; + #}); + LibMatrix = self.packages."${pkgs.stdenv.hostPlatform.system}".LibMatrix; #.overrideAttrs (old: { + # __intentionallyOverridingVersion = true; + # version = builtins.substring 0 29 old.version; # "1.0.0-preview-20251106-123456"; + # }); in { LibMatrix = makeNupkg {