Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 7becdb2363ab
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d5053d12eb23
Choose a head ref
  • 2 commits
  • 2 files changed
  • 2 contributors

Commits on Nov 16, 2019

  1. avldrums: 0.3.5 -> 0.4.0

    @magnetophon
    magnetophon authored and Jon committed Nov 16, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    82ed6bd View commit details

  2. ocamlPackages.lwt_ppx: fix dependency propagation 

    dune was showing this error when using lwt_ppx:

File "/nix/store/sz4cg32ph84lapgs50xv73s3a0baqq2s-ocaml4.08.1-lwt_ppx-4.2.1/lib/ocaml/4.08.1/site-lib/lwt_ppx/dune-package", line 11, characters 56-75:
11 |  (requires compiler-libs.common ocaml-migrate-parsetree ppx_tools_versioned)
                                                             ^^^^^^^^^^^^^^^^^^^
Error: Library "ppx_tools_versioned" not found.
-> required by library "lwt_ppx" in
   /nix/store/sz4cg32ph84lapgs50xv73s3a0baqq2s-ocaml4.08.1-lwt_ppx-4.2.1/lib/ocaml/4.08.1/site-lib/lwt_ppx
-> required by executable wizytests in dune:6
Hint: try: dune external-lib-deps --missing @@default
    @wizeman @vbgl
    wizeman authored and vbgl committed Nov 16, 2019
    Copy the full SHA
    d5053d1 View commit details
Showing with 3 additions and 4 deletions.
  1. +2 −2 pkgs/applications/audio/avldrums-lv2/default.nix
  2. +1 −2 pkgs/development/ocaml-modules/lwt/ppx.nix
4 changes: 2 additions & 2 deletions pkgs/applications/audio/avldrums-lv2/default.nix
View file
Original file line number Diff line number Diff line change
@@ -2,13 +2,13 @@

stdenv.mkDerivation rec {
pname = "avldrums.lv2";
version = "0.3.5";
version = "0.4.0";

src = fetchFromGitHub {
owner = "x42";
repo = pname;
rev = "v${version}";
sha256 = "00n2varc7iwp0xbfi45hpq4vlpxxb2kbrdzvrc20qp2265994bqf";
sha256 = "1z70rcq6z3gkb4fm8dm9hs31bslwr97zdh2n012fzki9b9rdj5qv";
fetchSubmodules = true;
};

3 changes: 1 addition & 2 deletions pkgs/development/ocaml-modules/lwt/ppx.nix
View file
Original file line number Diff line number Diff line change
@@ -5,8 +5,7 @@ buildDunePackage {

inherit (lwt) src version;

buildInputs = [ ppx_tools_versioned ];
propagatedBuildInputs = [ lwt ];
propagatedBuildInputs = [ lwt ppx_tools_versioned ];

meta = {
description = "Ppx syntax extension for Lwt";