nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 22:43:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

ocamlPackages.opam-repository: fix for opam 2.2

Browse Source
This commit is contained in:
Vincent Laporte 2024-07-24 08:01:17 +02:00 committed by Vincent Laporte
parent fd9cbc663d
commit 60fef87420
2 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/ocaml-modules/opam-repository/default.nix
View File

@ -1,25 +1,20 @@
{ lib, buildDunePackage, unzip, opam-format, curl }:
{ lib, buildDunePackage, opam-format, curl }:
buildDunePackage rec {
pname = "opam-repository";
minimalOCamlVersion = "4.02";
useDune2 = true;
inherit (opam-format) src version;
patches = [ ./download-tool.patch ];
postPatch = ''
substituteInPlace src/repository/opamRepositoryConfig.ml \
--replace "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\""
--replace-fail "SUBSTITUTE_NIXOS_CURL_PATH" "\"${curl}/bin/curl\""
'';
strictDeps = true;
nativeBuildInputs = [ unzip curl ];
propagatedBuildInputs = [ opam-format ];
configureFlags = [ "--disable-checks" ];
meta = opam-format.meta // {
description = "OPAM repository and remote sources handling, including curl/wget, rsync, git, mercurial, darcs backends";
maintainers = with lib.maintainers; [ sternenseemann ];

4
pkgs/top-level/ocaml-packages.nix
View File

@ -1388,9 +1388,7 @@ let
inherit (pkgs) unzip;
};
opam-repository = callPackage ../development/ocaml-modules/opam-repository {
inherit (pkgs) unzip;
};
opam-repository = callPackage ../development/ocaml-modules/opam-repository { };
opam-state = callPackage ../development/ocaml-modules/opam-state {
inherit (pkgs) unzip;