From c3bece532ae0df3fa6deaa05b3c6a5b08536d42c Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 15 Nov 2023 04:20:00 +0000 Subject: [PATCH] llpp: 41 -> 42 Diff: https://github.com/criticic/llpp/compare/v41...v42 Changelog: https://github.com/criticic/llpp/releases/tag/v42 --- pkgs/applications/misc/llpp/default.nix | 12 ++---------- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 38da8824cb0d..82c6976339c6 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -5,23 +5,15 @@ assert lib.versionAtLeast (lib.getVersion ocaml) "4.07"; stdenv.mkDerivation rec { pname = "llpp"; - version = "41"; + version = "42"; src = fetchFromGitHub { owner = "criticic"; repo = pname; rev = "v${version}"; - hash = "sha256-Doj0zLYI1pi7eK01+29xFLYPtc8+fWzj10292+PmToE="; + hash = "sha256-B/jKvBtBwMOErUVmGFGXXIT8FzMl1DFidfDCHIH41TU="; }; - patches = [ - (fetchpatch { - name = "system-makedeps-and-ocaml5.patch"; - url = "https://aur.archlinux.org/cgit/aur.git/plain/system-makedeps-and-ocaml5.patch?h=llpp&id=32955e115f914bb96348d288f9af9c6e3e80a02b"; - hash = "sha256-3rcPsR+M8Jx7M8GHUIsw0WNBvp6aE7BcPr4yk2vT9Ik="; - }) - ]; - postPatch = '' sed -i "2d;s/ver=.*/ver=${version}/" build.bash ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d8d86cb710cf..7368d79c3b67 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33470,9 +33470,7 @@ with pkgs; linuxsampler = callPackage ../applications/audio/linuxsampler { }; - llpp = callPackage ../applications/misc/llpp { - inherit (ocaml-ng.ocamlPackages_4_14) ocaml; - }; + llpp = callPackage ../applications/misc/llpp { }; lls = callPackage ../applications/networking/lls { };