Unverified Commit bbec6ac5 authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

[Backport release-25.11]... 

[Backport release-25.11] ocamlPackages.{mirage-bootvar-unix,mirage-device,samplerate,semaphore-compat,trie}: small cleaning (#466407)
parents 0ee3f312 72cd9dac

pkgs/development/ocaml-modules/mirage-bootvar-unix/default.nix

+4 −6
Original line number Diff line number Diff line
@@ -6,15 +6,13 @@ 
  parse-argv,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "mirage-bootvar-unix";

  version = "0.1.0";



  useDune2 = true;



  src = fetchurl {

    url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${version}/mirage-bootvar-unix-${version}.tbz";

    sha256 = "0r92s6y7nxg0ci330a7p0hii4if51iq0sixn20cnm5j4a2clprbf";

    url = "https://github.com/mirage/mirage-bootvar-unix/releases/download/${finalAttrs.version}/mirage-bootvar-unix-${finalAttrs.version}.tbz";

    hash = "sha256-buVLmVBElmoZELZHDXAMxUUSIwT3KDBGZOB1e7zRImU=";

  };



  propagatedBuildInputs = [
@@ -28,4 +26,4 @@ buildDunePackage rec { 
    license = lib.licenses.isc;

    maintainers = [ lib.maintainers.vbgl ];

  };

}
 
})

pkgs/development/ocaml-modules/mirage-device/default.nix

+6 −8
Original line number Diff line number Diff line
@@ -3,23 +3,21 @@ 
  buildDunePackage,

  fetchurl,

  fmt,

  ocaml_lwt,

  lwt,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "mirage-device";

  version = "2.0.0";



  useDune2 = true;



  src = fetchurl {

    url = "https://github.com/mirage/mirage-device/releases/download/v${version}/mirage-device-v${version}.tbz";

    sha256 = "18alxyi6wlxqvb4lajjlbdfkgcajsmklxi9xqmpcz07j51knqa04";

    url = "https://github.com/mirage/mirage-device/releases/download/v${finalAttrs.version}/mirage-device-v${finalAttrs.version}.tbz";

    hash = "sha256-BChsZyjygM9uxT3FTmfVUrE3XVtUSkXJ2rhTbqLvVKE=";

  };



  propagatedBuildInputs = [

    fmt

    ocaml_lwt

    lwt

  ];



  meta = {
@@ -28,4 +26,4 @@ buildDunePackage rec { 
    license = lib.licenses.isc;

    maintainers = [ lib.maintainers.vbgl ];

  };

}
 
})

pkgs/development/ocaml-modules/samplerate/default.nix

+7 −9
Original line number Diff line number Diff line
@@ -6,26 +6,24 @@ 
  libsamplerate,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "samplerate";

  version = "0.1.6";



  useDune2 = true;



  src = fetchFromGitHub {

    owner = "savonet";

    repo = "ocaml-samplerate";

    rev = "v${version}";

    sha256 = "0h0i9v9p9n2givv3wys8qrfi1i7vp8kq7lnkf14s7d3m4r8x4wrp";

    tag = "v${finalAttrs.version}";

    hash = "sha256-N3PSUSZ1tKNJcNPSgye6+8QQXcZIez72jk/YdNNOEUA=";

  };



  buildInputs = [ dune-configurator ];

  propagatedBuildInputs = [ libsamplerate ];



  meta = with lib; {

  meta = {

    homepage = "https://github.com/savonet/ocaml-samplerate";

    description = "Interface for libsamplerate";

    license = licenses.bsd2;

    maintainers = with maintainers; [ dandellion ];

    license = lib.licenses.bsd2;

    maintainers = with lib.maintainers; [ dandellion ];

  };

}
 
})

pkgs/development/ocaml-modules/semaphore-compat/default.nix

+7 −9
Original line number Diff line number Diff line
@@ -4,24 +4,22 @@ 
  fetchurl,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "semaphore-compat";

  version = "1.0.2";



  src = fetchurl {

    url = "https://github.com/mirage/semaphore-compat/releases/download/${version}/semaphore-compat-${version}.tbz";

    sha256 = "sha256-4CnZ2vX17IPpnlA7CNeuxZEKfA5HFoeQvwH0tCKNRnY=";

    url = "https://github.com/mirage/semaphore-compat/releases/download/${finalAttrs.version}/semaphore-compat-${finalAttrs.version}.tbz";

    hash = "sha256-4CnZ2vX17IPpnlA7CNeuxZEKfA5HFoeQvwH0tCKNRnY=";

  };



  useDune2 = true;



  meta = with lib; {

  meta = {

    description = "Compatibility Semaphore module";

    homepage = "https://github.com/mirage/semaphore-compat";

    license = with licenses; [

    license = with lib.licenses; [

      lgpl21Plus

      ocamlLgplLinkingException

    ];

    maintainers = [ maintainers.sternenseemann ];

    maintainers = [ lib.maintainers.sternenseemann ];

  };

}
 
})

pkgs/development/ocaml-modules/trie/default.nix

+6 −8
Original line number Diff line number Diff line
@@ -4,24 +4,22 @@ 
  fetchFromGitHub,

}:



buildDunePackage rec {

buildDunePackage (finalAttrs: {

  pname = "trie";

  version = "1.0.0";



  useDune2 = true;



  src = fetchFromGitHub {

    owner = "kandu";

    repo = pname;

    rev = version;

    sha256 = "0s7p9swjqjsqddylmgid6cv263ggq7pmb734z4k84yfcrgb6kg4g";

    repo = "trie";

    tag = finalAttrs.version;

    hash = "sha256-j7xp1svMeYIm+WScVe/B7w0jNjMtvkp9a1hLLLlO92g=";

  };



  meta = {

    inherit (src.meta) homepage;

    homepage = "https://github.com/kandu/trie/";

    license = lib.licenses.mit;

    description = "Strict impure trie tree";

    maintainers = [ lib.maintainers.vbgl ];

  };



}
 
})