nrabulinski/nix-config - Change FH5X6FMOHRX5CZVY6P6X6BVQH5Q5C3XV6DGWR4QJZORAMFEXQHUQC

Added conduit-latest

Created by nrabulinski on January 2, 2023

FH5X6FMOHRX5CZVY6P6X6BVQH5Q5C3XV6DGWR4QJZORAMFEXQHUQC

Dependencies

In channels

main

Change contents

File addition: result (d--x------)
[3.2]
File addition: pkgs (d--x------)
[3.2]

File addition: default.nix (----------)

[0.36]

{ ... }: {
  perSystem = { pkgs, inputs', ... }: {
    packages = {
      conduit-latest = pkgs.callPackage ./conduit { crane = inputs'.crane.lib; };
    };
  };
}

File addition: conduit (d--x------)
[0.36]

File addition: deps-fix.patch (----------)

[0.259]

diff --git a/Cargo.lock b/Cargo.lock
index 505c71c..7bb9e6d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2076,7 +2076,7 @@ dependencies = [
 [[package]]
 name = "ruma"
 version = "0.7.4"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "assign",
  "js_int",
@@ -2094,7 +2094,7 @@ dependencies = [
 [[package]]
 name = "ruma-appservice-api"
 version = "0.7.0"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2105,7 +2105,7 @@ dependencies = [
 [[package]]
 name = "ruma-client-api"
 version = "0.15.3"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "assign",
  "bytes",
@@ -2122,7 +2122,7 @@ dependencies = [
 [[package]]
 name = "ruma-common"
 version = "0.10.5"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "base64 0.20.0",
  "bytes",
@@ -2150,7 +2150,7 @@ dependencies = [
 [[package]]
 name = "ruma-federation-api"
 version = "0.6.0"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2161,7 +2161,7 @@ dependencies = [
 [[package]]
 name = "ruma-identifiers-validation"
 version = "0.9.0"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "js_int",
  "thiserror",
@@ -2170,7 +2170,7 @@ dependencies = [
 [[package]]
 name = "ruma-identity-service-api"
 version = "0.6.0"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2180,7 +2180,7 @@ dependencies = [
 [[package]]
 name = "ruma-macros"
 version = "0.10.5"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "once_cell",
  "proc-macro-crate",
@@ -2195,7 +2195,7 @@ dependencies = [
 [[package]]
 name = "ruma-push-gateway-api"
 version = "0.6.0"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "js_int",
  "ruma-common",
@@ -2206,7 +2206,7 @@ dependencies = [
 [[package]]
 name = "ruma-signatures"
 version = "0.12.0"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "base64 0.20.0",
  "ed25519-dalek",
@@ -2222,7 +2222,7 @@ dependencies = [
 [[package]]
 name = "ruma-state-res"
 version = "0.8.0"
-source = "git+https://github.com/ruma/ruma?rev=67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26#67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26"
+source = "git+https://github.com/DeeUnderscore/ruma?rev=1f76d442c790f2612fa567ec91c35defb69c43d1#1f76d442c790f2612fa567ec91c35defb69c43d1"
 dependencies = [
  "itertools",
  "js_int",
diff --git a/Cargo.toml b/Cargo.toml
index 019f9ce..0c5e7e2 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -21,7 +21,7 @@ tower-http = { version = "0.3.4", features = ["add-extension", "cors", "compress
 
 # Used for matrix spec type definitions and helpers
 #ruma = { version = "0.4.0", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
-ruma = { git = "https://github.com/ruma/ruma", rev = "67d0f3cc04a8d1dc4a8a1ec947519967ce11ce26", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
+ruma = { git = "https://github.com/DeeUnderscore/ruma", rev = "1f76d442c790f2612fa567ec91c35defb69c43d1", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-msc2448", "unstable-exhaustive-types", "ring-compat", "unstable-unspecified" ] }
 #ruma = { git = "https://github.com/timokoesters/ruma", rev = "50c1db7e0a3a21fc794b0cce3b64285a4c750c71", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }
 #ruma = { path = "../ruma/crates/ruma", features = ["compat", "rand", "appservice-api-c", "client-api", "federation-api", "push-gateway-api-c", "state-res", "unstable-pre-spec", "unstable-exhaustive-types"] }

File addition: default.nix (----------)

[0.259]

{ fetchFromGitLab, lib, stdenvNoCC, crane, stdenv, libiconv, darwin }: let
  src = fetchFromGitLab {
    owner = "Famedly";
    repo = "Conduit";
    rev = "19156c7bbf8dab7267db235807ea80255ee91e7e";
    sha256 = "sha256-QRXamd1BtQOkxSeAo/8Z6Xqc8PZEE1PxW4ZunYQwCCc=";
  };
  patchedSrc = stdenvNoCC.mkDerivation {
    inherit src;
    name = "conduit-source-patched";
    patches = [ ./deps-fix.patch ];
    installPhase = ''
      runHook preInstall
      mkdir -p $out
      cp -R Cargo.toml Cargo.lock src $out/
      runHook postInstall
    '';
  };
  appleFrameworks = with darwin.apple_sdk.frameworks; [
    Security
  ];
in
crane.buildPackage {
  src = patchedSrc;
  buildInputs = lib.optionals stdenv.isDarwin ([ libiconv ] ++ appleFrameworks);
}

Insertion in hosts/satelite/default.nix at line 34 [2.6968]

[2.7805]

          services.matrix-conduit.package = self'.packages.conduit-latest;

Insertion in flake.nix at line 39 [3.1162]

[2.79212]

[3.1395]

    crane = {
      url = "github:ipetkov/crane";
      inputs.nixpkgs.follows = "nixpkgs";
    };

Insertion in flake.nix at line 61 [3.1162]
[2.79496]
[2.79496]
```
        ./pkgs
```

Insertion in flake.lock at line 19 [3.4]

[4.4089]

[2.80108]

    "crane": {
      "inputs": {
        "flake-compat": "flake-compat",
        "flake-utils": "flake-utils",
        "nixpkgs": [
          "nixpkgs"
        ],
        "rust-overlay": "rust-overlay"
      },
      "locked": {
        "lastModified": 1672095661,
        "narHash": "sha256-7NTsdCn3qsvU7A+1/7tY8pxbq0DYy1pFYNpzN6he9lI=",
        "owner": "ipetkov",
        "repo": "crane",
        "rev": "98894bb39b03bfb379c5e10523cd61160e1ac782",
        "type": "github"
      },
      "original": {
        "owner": "ipetkov",
        "repo": "crane",
        "type": "github"
      }
    },

Replacement in flake.lock at line 64 [3.4]
B:BD[5.3108199] → [5.3108199:3108239]
```
        "flake-compat": "flake-compat",
```
[5.3108199]
[5.3108239]
```
        "flake-compat": "flake-compat_2",
```

Insertion in flake.lock at line 126 [3.4]

[6.293]

      "flake": false,
      "locked": {
        "lastModified": 1668681692,
        "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=",
        "owner": "edolstra",
        "repo": "flake-compat",
        "rev": "009399224d5e398d03b22badca40a37ac85412a1",
        "type": "github"
      },
      "original": {
        "owner": "edolstra",
        "repo": "flake-compat",
        "type": "github"
      }
    },
    "flake-compat_2": {

Insertion in flake.lock at line 175 [3.4]

[7.6683]

[3.20]

    "flake-utils": {
      "locked": {
        "lastModified": 1667395993,
        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
        "owner": "numtide",
        "repo": "flake-utils",
        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
        "type": "github"
      },
      "original": {
        "owner": "numtide",
        "repo": "flake-utils",
        "type": "github"
      }
    },

Insertion in flake.lock at line 323 [3.4]
[3.1002]
[2.82805]
```
        "crane": "crane",
```

Insertion in flake.lock at line 353 [3.4]

[6.2150]

    "rust-overlay": {
      "inputs": {
        "flake-utils": [
          "crane",
          "flake-utils"
        ],
        "nixpkgs": [
          "crane",
          "nixpkgs"
        ]
      },
      "locked": {
        "lastModified": 1670034122,
        "narHash": "sha256-EqmuOKucPWtMvCZtHraHr3Q3bgVszq1x2PoZtQkUuEk=",
        "owner": "oxalica",
        "repo": "rust-overlay",
        "rev": "a0d5773275ecd4f141d792d3a0376277c0fc0b65",
        "type": "github"
      },
      "original": {
        "owner": "oxalica",
        "repo": "rust-overlay",
        "type": "github"
      }
    },

Added conduit-latest

Dependencies

In channels

Change contents

File addition: result (d--x------)

File addition: pkgs (d--x------)

File addition: default.nix (----------)

File addition: conduit (d--x------)

File addition: deps-fix.patch (----------)

File addition: default.nix (----------)

Insertion in hosts/satelite/default.nix at line 34 [2.6968]

Insertion in flake.nix at line 39 [3.1162]

Insertion in flake.nix at line 61 [3.1162]

Insertion in flake.lock at line 19 [3.4]

Replacement in flake.lock at line 64 [3.4]

Insertion in flake.lock at line 126 [3.4]

Insertion in flake.lock at line 175 [3.4]

Insertion in flake.lock at line 323 [3.4]

Insertion in flake.lock at line 353 [3.4]