quartz55/discopotty - Change AE4PHS6EEAG647L3MTTR6IKZJZGRTP6TGOUEBSTUYKKDFIOPF47QC

Fix disco derivation

Created by quartz55 on April 23, 2022

AE4PHS6EEAG647L3MTTR6IKZJZGRTP6TGOUEBSTUYKKDFIOPF47QC

Dependencies

In channels

main

Change contents

File deletion: shell.nix

BF:BFD[3.2] → [2.17685:17718]

BF:BFD[2.17718] → [2.16791:16791]

B:BD[2.16791] → [2.16792:17684]

{ pkgs, stdenv, lib, self }:
let
  discoPkgs = pkgs.recurseIntoAttrs self.packages.${stdenv.system};
  discoDrvs = lib.filterAttrs (_: value: lib.isDerivation value) discoPkgs;
  filterDrvs = inputs:
    lib.filter
      (drv:
        !(lib.hasAttr "pname" drv) ||
        drv.pname == null ||
        !(lib.any
          (name: name == drv.pname || name == drv.name)
          (lib.attrNames discoDrvs)))
      inputs;
in
(pkgs.mkShell {
  OCAMLRUNPARAM = "b";
  inputsFrom = lib.attrValues discoDrvs;
  # inputsFrom = [ self.packages.${stdenv.system}.discopotty ];
  buildInputs = with pkgs; [
    ocaml
    ocamlPackages.ocaml-lsp
    ocamlPackages.dune
    ocamlformat
    ocamlPackages.merlin
    ocamlPackages.utop
    ffmpeg
    youtube-dl
  ];
})
# .overrideAttrs (o: {
#   propagatedBuildInputs = filterDrvs o.propagatedBuildInputs;
#   buildInputs = filterDrvs o.buildInputs;
# })

Replacement in default.nix at line 1 [2.404]
B:BD[2.404] → [2.405:423]
```
{
  ocamlPackages
```
[2.404]
[2.423]
```
{ lib
, ocamlPackages
```

Replacement in default.nix at line 9 [2.404]

B:BD[2.506] → [2.506:519]

  src = ./.;

[2.506]

[2.519]


  src = lib.filterGitSource {
    src = ./.;
    dirs = [ "lib" "tests" ];
    files = [ "dune" "dune-project" "disco.opam" ];
  };

Replacement in default.nix at line 40 [2.404]
B:BD[2.816] → [2.816:817]
```
}
```
[2.816]
```
}
```
Deletion in discopotty.nix at line 16 [2.855]
B:BD[2.1151] → [2.1151:1165]
```
    # findlib
```
Replacement in discopotty.nix at line 33 [2.855]
B:BD[2.1492] → [2.1492:1493]
```
}
```
[2.1492]
```
}
```

Replacement in flake.nix at line 54 [4.520026]

B:BD[2.7068] → [2.7068:7100]

                  patches = [];

[2.7068]

[2.7100]

                  patches = [ ];

Replacement in flake.nix at line 94 [4.520026]

B:BD[2.8529] → [2.8529:8814]

                ctypes-foreign = super.ocamlPackages.buildDunePackage {
                  pname = "${self.ocamlPackages.ctypes.pname}-foreign";
                  inherit (self.ocamlPackages.ctypes) version src;
                  buildInputs = with self; [ libffi ];
                };

[2.8529]

[2.8814]

                # TODO @quartz55: upstream this
                websocketaf = super.ocamlPackages.websocketaf.overrideAttrs (_: rec {
                  rev = "49bb812266608835b56ea75bf18f75666639a760";
                  src = builtins.fetchurl {
                    url = "https://github.com/quartz55/websocketaf/archive/${rev}.tar.gz";
                    sha256 = sha256:0lsnrl8h5bmx866lflnbca4yhwzq4q67d15q51157khnchjr34rq;
                  };
                });

Replacement in flake.nix at line 103 [4.520026]

B:BD[2.8815] → [2.8815:8881]

                disco-opus = super.callPackage ./vendor/opus { };

[2.8815]

[2.8881]

                # TODO @quartz55: update it upstream

Insertion in flake.nix at line 122 [4.520026]

[2.9739]

                disco-opus = super.callPackage ./vendor/opus { };

Replacement in lib/voice/call.ml at line 113 [6.115320]

B:BD[5.4274] → [5.4274:4333]

        L.info (fun m -> m "join request while detached");

[5.4274]

[5.4333]

        L.dbg (fun m -> m "join request while detached");

Replacement in lib/voice/call.ml at line 158 [6.115320]

B:BD[5.6185] → [5.6185:6260]

        L.info (fun m -> m "join request while live, switching channels");

[5.6185]

[5.6260]

        L.dbg (fun m -> m "join request while live, switching channels");

Replacement in lib/voice/call.ml at line 168 [6.115320]

B:BD[5.6681] → [5.6681:6749]

        L.warn (fun m -> m "new voice session info, reconnecting");

[5.6681]

[5.6749]

        L.dbg (fun m -> m "new voice session info, reconnecting");

Replacement in lib/voice/call.ml at line 173 [6.115320]

B:BD[5.6882] → [5.6882:6926]

        L.info (fun m -> m "disconnected");

[5.6882]

[5.6926]

        L.dbg (fun m -> m "disconnected");

Deletion in lib/voice/call.ml at line 214 [6.115320]
B:BD[5.7919] → [5.7919:7949]
```
  Eio.Stream.add t.evs Gw_dc;
```

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

[3.2]

{ pkgs, stdenv, lib, self }:
let
  discoPkgs = pkgs.recurseIntoAttrs self.packages.${stdenv.system};
  discoDrvs = lib.filterAttrs (_: value: lib.isDerivation value) discoPkgs;
  filterDrvs = inputs:
    lib.filter
      (drv:
        !(lib.hasAttr "pname" drv) ||
        drv.pname == null ||
        !(lib.any
          (name: name == drv.pname || name == drv.name)
          (lib.attrNames discoDrvs)))
      inputs;
in
(pkgs.mkShell {
  OCAMLRUNPARAM = "b";
  inputsFrom = lib.attrValues discoDrvs;
  buildInputs = with pkgs; [
    ocamlPackages.ocaml-lsp
    ocamlformat
    ocamlPackages.merlin
    ocamlPackages.utop
    ffmpeg
    youtube-dl
  ];
}).overrideAttrs (o: {
  propagatedBuildInputs = filterDrvs o.propagatedBuildInputs;
  buildInputs = filterDrvs o.buildInputs;
})

Replacement in vendor/opus/default.nix at line 1 [2.17721]
B:BD[2.17721] → [2.17722:17768]
```
{ 
  ocamlPackages
  , pkg-config
  , libopus
```
[2.17721]
[2.17768]
```
{ ocamlPackages
, pkg-config
, libopus
```
Replacement in vendor/opus/default.nix at line 17 [2.17721]
B:BD[2.17956] → [2.17956:17957]
```
}
```
[2.17956]
```
}
```

Fix disco derivation

Dependencies

In channels

Change contents

File deletion: shell.nix

Replacement in default.nix at line 1 [2.404]

Replacement in default.nix at line 9 [2.404]

Replacement in default.nix at line 40 [2.404]

Deletion in discopotty.nix at line 16 [2.855]

Replacement in discopotty.nix at line 33 [2.855]