pyrox.dev
opam: remove aspcud from runtime
+2
-2
pkgs/development/tools/ocaml/opam/default.nix
+2
-2
pkgs/development/tools/ocaml/opam/default.nix
···
1
1
{ stdenv, lib, fetchurl, makeWrapper, getconf,
2
-
ocaml, unzip, ncurses, curl, aspcud, bubblewrap
2
+
ocaml, unzip, ncurses, curl, bubblewrap
3
3
}:
4
4
5
5
assert lib.versionAtLeast ocaml.version "4.02.3";
···
119
119
mv $out/bin/opam $out/bin/.opam-wrapped
120
120
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
121
121
--argv0 "opam" \
122
-
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
122
+
--suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
123
123
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
124
124
$out/bin/opam-installer --prefix=$installer opam-installer.install
125
125
'';
+3
-3
pkgs/development/tools/ocaml/opam/opam.nix.pl
+3
-3
pkgs/development/tools/ocaml/opam/opam.nix.pl
···
21
21
22
22
my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
23
23
my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
24
-
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m
24
+
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m
25
25
or die "could not parse ocaml version bound\n";
26
26
27
27
print <<"EOF";
28
28
{ stdenv, lib, fetchurl, makeWrapper, getconf,
29
-
ocaml, unzip, ncurses, curl, aspcud, bubblewrap
29
+
ocaml, unzip, ncurses, curl, bubblewrap
30
30
}:
31
31
32
32
assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";
···
114
114
mv $out/bin/opam $out/bin/.opam-wrapped
115
115
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
116
116
--argv0 "opam" \
117
-
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
117
+
--suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
118
118
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
119
119
$out/bin/opam-installer --prefix=$installer opam-installer.install
120
120
'';