BoomMicrophone/nixpkgs-suyu
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #185345 from ylh/patch-opam-internal-solver

Browse source 
opam: remove aspcud from runtime
This commit is contained in:
Mario Rodas 2022-08-06 18:08:46 -05:00 committed by GitHub
commit cff7b91dc9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
pkgs/development/tools/ocaml/opam/default.nix
View file

@ -1,5 +1,5 @@
{ stdenv, lib, fetchurl, makeWrapper, getconf, { stdenv, lib, fetchurl, makeWrapper, getconf,
ocaml, unzip, ncurses, curl, aspcud, bubblewrap ocaml, unzip, ncurses, curl, bubblewrap
}: }:
assert lib.versionAtLeast ocaml.version "4.02.3"; assert lib.versionAtLeast ocaml.version "4.02.3";
@ -119,7 +119,7 @@ in stdenv.mkDerivation {
mv $out/bin/opam $out/bin/.opam-wrapped mv $out/bin/opam $out/bin/.opam-wrapped
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \ --argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install $out/bin/opam-installer --prefix=$installer opam-installer.install
''; '';

6
pkgs/development/tools/ocaml/opam/opam.nix.pl
View file

@ -21,12 +21,12 @@ chomp $OPAM_RELEASE_SHA256;
my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG"; my $OPAM_BASE_URL = "https://raw.githubusercontent.com/$OPAM_GITHUB_REPO/$OPAM_TAG";
my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`; my $OPAM_OPAM = `curl -L --url \Q$OPAM_BASE_URL\E/opam-devel.opam`;
my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" {>= "(.*)"}$/m my($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^ "ocaml" \{>= "(.*)"}$/m
or die "could not parse ocaml version bound\n"; or die "could not parse ocaml version bound\n";
print <<"EOF"; print <<"EOF";
{ stdenv, lib, fetchurl, makeWrapper, getconf, { stdenv, lib, fetchurl, makeWrapper, getconf,
ocaml, unzip, ncurses, curl, aspcud, bubblewrap ocaml, unzip, ncurses, curl, bubblewrap
}: }:
assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION"; assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";
@ -114,7 +114,7 @@ print <<'EOF';
mv $out/bin/opam $out/bin/.opam-wrapped mv $out/bin/opam $out/bin/.opam-wrapped
makeWrapper $out/bin/.opam-wrapped $out/bin/opam \ makeWrapper $out/bin/.opam-wrapped $out/bin/opam \
--argv0 "opam" \ --argv0 "opam" \
--suffix PATH : ${aspcud}/bin:${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \ --suffix PATH : ${unzip}/bin:${curl}/bin:${lib.optionalString stdenv.isLinux "${bubblewrap}/bin:"}${getconf}/bin \
--set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/ --set OPAM_USER_PATH_RO /run/current-system/sw/bin:/nix/
$out/bin/opam-installer --prefix=$installer opam-installer.install $out/bin/opam-installer --prefix=$installer opam-installer.install
''; '';