Unverified Commit d899912e authored by Sandro Jäckel's avatar Sandro Jäckel Committed by GitHub
Browse files

Merge pull request #324381 from kit-ty-kate/opam-2.2.0 

opam: 2.1.5 -> 2.2.0
parents d9a71b55 3f6b0d69

pkgs/development/tools/ocaml/opam/default.nix

+9 −98
Original line number Diff line number Diff line
@@ -2,82 +2,16 @@ 
  ocaml, unzip, ncurses, curl, bubblewrap, Foundation

}:



assert lib.versionAtLeast ocaml.version "4.02.3";

assert lib.versionAtLeast ocaml.version "4.08.0";



let

  srcs = {

    "0install-solver" = fetchurl {

      url = "https://github.com/0install/0install/releases/download/v2.17/0install-v2.17.tbz";

      sha256 = "08q95mzmf9pyyqs68ff52422f834hi313cxmypwrxmxsabcfa10p";

    };

    "base64" = fetchurl {

      url = "https://github.com/mirage/ocaml-base64/releases/download/v3.5.0/base64-v3.5.0.tbz";

      sha256 = "19735bvb3k263hzcvdhn4d5lfv2qscc9ib4q85wgxsvq0p0fk7aq";

    };

    "cmdliner" = fetchurl {

      url = "http://erratique.ch/software/cmdliner/releases/cmdliner-1.0.4.tbz";

      sha256 = "1h04q0zkasd0mw64ggh4y58lgzkhg6yhzy60lab8k8zq9ba96ajw";

    };

    "cppo" = fetchurl {

      url = "https://github.com/ocaml-community/cppo/archive/v1.6.8.tar.gz";

      sha256 = "0lxy4xkkkwgs1cj6d9lyzsqi9f6fc9r6cir5imi7yjqrpd86s1by";

    };

    "cudf" = fetchurl {

      url = "https://gitlab.com/irill/cudf/-/archive/v0.10/cudf-v0.10.tar.gz";

      sha256 = "0l7vzvlrk4x4vw1lkd1wzarxz3h82r3835singcay8m8zj8777bv";

    };

    "dose3" = fetchurl {

      url = "https://gitlab.com/irill/dose3/-/archive/7.0.0/dose3-7.0.0.tar.gz";

      sha256 = "0ab0llqdmy82ljh8xdf57y00c9jvf1vnxiq9hczli0r6vc263nq2";

    };

    "dune-local" = fetchurl {

      url = "https://github.com/ocaml/dune/releases/download/3.5.0/dune-3.5.0.tbz";

      sha256 = "041n16sn41wwj6fgi7l10hvbl5x5swygqv33d4csx7rm0iklrgbp";

    };

    "extlib" = fetchurl {

      url = "https://github.com/ygrek/ocaml-extlib/releases/download/1.7.9/extlib-1.7.9.tar.gz";

      sha256 = "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq";

    };

    "mccs" = fetchurl {

      url = "https://github.com/AltGr/ocaml-mccs/archive/1.1+13.tar.gz";

      sha256 = "05nnji9h8mss3hzjr5faid2v3xfr7rcv2ywmpcxxp28y6h2kv9gv";

    };

    "ocamlgraph" = fetchurl {

      url = "https://github.com/backtracking/ocamlgraph/releases/download/2.0.0/ocamlgraph-2.0.0.tbz";

      sha256 = "029692bvdz3hxpva9a2jg5w5381fkcw55ysdi8424lyyjxvjdzi0";

    };

    "opam-0install-cudf" = fetchurl {

      url = "https://github.com/ocaml-opam/opam-0install-solver/releases/download/v0.4.2/opam-0install-cudf-v0.4.2.tbz";

      sha256 = "10wma4hh9l8hk49rl8nql6ixsvlz3163gcxspay5fwrpbg51fmxr";

    };

    "opam-file-format" = fetchurl {

      url = "https://github.com/ocaml/opam-file-format/archive/2.1.4.tar.gz";

      sha256 = "0xbdlpxb0348pbwijna2x6nbi8fcxdh63cwrznn4q4zzbv9zsy02";

    };

    "re" = fetchurl {

      url = "https://github.com/ocaml/ocaml-re/releases/download/1.10.3/re-1.10.3.tbz";

      sha256 = "1fqfg609996bgxr14yyfxhvl6hm9c1j0mm2xjdjigqrzgyb4crc4";

    };

    "result" = fetchurl {

      url = "https://github.com/janestreet/result/releases/download/1.5/result-1.5.tbz";

      sha256 = "0cpfp35fdwnv3p30a06wd0py3805qxmq3jmcynjc3x2qhlimwfkw";

    };

    "seq" = fetchurl {

      url = "https://github.com/c-cube/seq/archive/0.2.2.tar.gz";

      sha256 = "1ck15v3pg8bacdg6d6iyp2jc3kgrzxk5jsgzx3287x2ycb897j53";

    };

    "stdlib-shims" = fetchurl {

      url = "https://github.com/ocaml/stdlib-shims/releases/download/0.3.0/stdlib-shims-0.3.0.tbz";

      sha256 = "0jnqsv6pqp5b5g7lcjwgd75zqqvcwcl5a32zi03zg1kvj79p5gxs";

    };

    opam = fetchurl {

      url = "https://github.com/ocaml/opam/archive/2.1.5.zip";

      sha256 = "0s8r5gfs2zsyfn3jzqnvns3g0rkik3pw628n0dik55fwq3zjgg4a";

    };

  };

in stdenv.mkDerivation {

stdenv.mkDerivation {

  pname = "opam";

  version = "2.1.5";

  version = "2.2.0";



  src = fetchurl {

    url = "https://github.com/ocaml/opam/releases/download/2.2.0/opam-full-2.2.0-2.tar.gz";

    sha256 = "459ed64e6643f05c677563a000e3baa05c76ce528064e9cb9ce6db49fff37c97";

  };



  strictDeps = true;
@@ -86,35 +20,13 @@ in stdenv.mkDerivation { 
    ++ lib.optionals stdenv.isLinux [ bubblewrap ]

    ++ lib.optionals stdenv.isDarwin [ Foundation ];



  src = srcs.opam;



  postUnpack = ''

    ln -sv ${srcs."0install-solver"} $sourceRoot/src_ext/0install-solver.tbz

    ln -sv ${srcs."base64"} $sourceRoot/src_ext/base64.tbz

    ln -sv ${srcs."cmdliner"} $sourceRoot/src_ext/cmdliner.tbz

    ln -sv ${srcs."cppo"} $sourceRoot/src_ext/cppo.tar.gz

    ln -sv ${srcs."cudf"} $sourceRoot/src_ext/cudf.tar.gz

    ln -sv ${srcs."dose3"} $sourceRoot/src_ext/dose3.tar.gz

    ln -sv ${srcs."dune-local"} $sourceRoot/src_ext/dune-local.tbz

    ln -sv ${srcs."extlib"} $sourceRoot/src_ext/extlib.tar.gz

    ln -sv ${srcs."mccs"} $sourceRoot/src_ext/mccs.tar.gz

    ln -sv ${srcs."ocamlgraph"} $sourceRoot/src_ext/ocamlgraph.tbz

    ln -sv ${srcs."opam-0install-cudf"} $sourceRoot/src_ext/opam-0install-cudf.tbz

    ln -sv ${srcs."opam-file-format"} $sourceRoot/src_ext/opam-file-format.tar.gz

    ln -sv ${srcs."re"} $sourceRoot/src_ext/re.tbz

    ln -sv ${srcs."result"} $sourceRoot/src_ext/result.tbz

    ln -sv ${srcs."seq"} $sourceRoot/src_ext/seq.tar.gz

    ln -sv ${srcs."stdlib-shims"} $sourceRoot/src_ext/stdlib-shims.tbz

  '';



  patches = [ ./opam-shebangs.patch ];



  preConfigure = ''

    substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"

    patchShebangs src/state/shellscripts

  '';



  postConfigure = "make lib-ext";

  configureFlags = [ "--with-vendored-deps" "--with-mccs" ];



  # Dirty, but apparently ocp-build requires a TERM

  makeFlags = ["TERM=screen"];
@@ -144,4 +56,3 @@ in stdenv.mkDerivation { 
    platforms = platforms.all;

  };

}
 
# Generated by: ./opam.nix.pl -v 2.1.5 -p opam-shebangs.patch

pkgs/development/tools/ocaml/opam/opam-shebangs.patch

+11 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ diff --git a/src/client/opamInitDefaults.ml b/src/client/opamInitDefaults.ml 
index eca13a7c..1fd66f43 100644

--- a/src/client/opamInitDefaults.ml

+++ b/src/client/opamInitDefaults.ml

@@ -35,14 +35,18 @@ let eval_variables = [

@@ -42,16 +42,20 @@ let eval_variables = [

 let os_filter os =

   FOp (FIdent ([], OpamVariable.of_string "os", None), `Eq, FString os)
@@ -13,17 +13,21 @@ index eca13a7c..1fd66f43 100644 
 let macos_filter = os_filter "macos"

 let openbsd_filter = os_filter "openbsd"

 let freebsd_filter = os_filter "freebsd"

 let netbsd_filter = os_filter "netbsd"

 let dragonflybsd_filter = os_filter "dragonfly"

 let not_open_free_bsd_filter =

   FNot (FOr (openbsd_filter,  freebsd_filter))

 let win32_filter = os_filter "win32"

 let not_win32_filter =

   FOp (FIdent ([], OpamVariable.of_string "os", None), `Neq, FString "win32")

 let sandbox_filter = FOr (linux_filter, macos_filter)

+let nixos_filter = os_distribution_filter "nixos"

 

 let gpatch_filter = FOr (openbsd_filter, freebsd_filter)

 let gpatch_filter =

   FOr (FOr (openbsd_filter, netbsd_filter),

        FOr (freebsd_filter, dragonflybsd_filter))

 let patch_filter = FNot gpatch_filter

@@ -50,6 +54,11 @@ let wrappers ~sandboxing () =

     CString t, None;

   ] in

@@ -79,4 +81,9 @@ let wrappers ~sandboxing () =

   let w = OpamFile.Wrappers.empty in

+  let w = { w with

+            OpamFile.Wrappers.
@@ -31,8 +35,8 @@ index eca13a7c..1fd66f43 100644 
+          }

+  in

   if sandboxing then

     { w with

       OpamFile.Wrappers.

     List.fold_left OpamFile.Wrappers.(fun w -> function

         | `build wrap_build -> { w with wrap_build }

@@ -113,6 +122,7 @@ let required_tools ~sandboxing () =

 let init_scripts () = [

   ("sandbox.sh", OpamScript.bwrap), Some bwrap_filter;

pkgs/development/tools/ocaml/opam/opam.nix.pl

deleted100755 → 0
+0 −138
Original line number Diff line number Diff line 
#!/usr/bin/env perl



use strict;

use warnings qw<all>;

use Getopt::Std;



my $gencmd = "# Generated by: " . join(" ", $0, @ARGV) . "\n";



our $opt_v;

our $opt_p;

our $opt_r;

our $opt_t;

getopts "v:p:t:r:";



my $OPAM_RELEASE = $opt_v // "2.0.0";

my $OPAM_TAG = $opt_t // $OPAM_RELEASE;

my $OPAM_GITHUB_REPO = $opt_r // "ocaml/opam";

my $OPAM_RELEASE_URL = "https://github.com/$OPAM_GITHUB_REPO/archive/$OPAM_TAG.zip";

my $OPAM_RELEASE_SHA256 = `nix-prefetch-url \Q$OPAM_RELEASE_URL\E`;

chomp $OPAM_RELEASE_SHA256;



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($OCAML_MIN_VERSION) = $OPAM_OPAM =~ /^  "ocaml" \{>= "(.*)"}$/m

  or die "could not parse ocaml version bound\n";



print <<"EOF";

{ stdenv, lib, fetchurl, makeWrapper, getconf,

  ocaml, unzip, ncurses, curl, bubblewrap, Foundation

}:



assert lib.versionAtLeast ocaml.version "$OCAML_MIN_VERSION";



let

  srcs = {

EOF



my %urls = ();

my %md5s = ();



open(SOURCES, "-|", "curl", "-L", "--url", "$OPAM_BASE_URL/src_ext/Makefile.sources");

while (<SOURCES>) {

  if (/^URL_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {

    $urls{$1} = $2;

  } elsif (/^MD5_(?!PKG_)([-\w]+)\s*=\s*(\S+)$/) {

    $md5s{$1} = $2;

  }

}

for my $src (sort keys %urls) {

  my ($sha256,$store_path) = split /\n/, `nix-prefetch-url --print-path \Q$urls{$src}\E`;

  system "echo \Q$md5s{$src}\E' *'\Q$store_path\E | md5sum -c 1>&2";

  die "md5 check failed for $urls{$src}\n" if $?;

  print <<"EOF";

    "$src" = fetchurl {

      url = "$urls{$src}";

      sha256 = "$sha256";

    };

EOF

}



print <<"EOF";

    opam = fetchurl {

      url = "$OPAM_RELEASE_URL";

      sha256 = "$OPAM_RELEASE_SHA256";

    };

  };

in stdenv.mkDerivation {

  pname = "opam";

  version = "$OPAM_RELEASE";



  strictDeps = true;



  nativeBuildInputs = [ makeWrapper unzip ocaml curl ];

  buildInputs = [ ncurses getconf ]

    ++ lib.optionals stdenv.isLinux [ bubblewrap ]

    ++ lib.optionals stdenv.isDarwin [ Foundation ];



  src = srcs.opam;



  postUnpack = ''

EOF

for my $src (sort keys %urls) {

  my($ext) = $urls{$src} =~ /(\.(?:t(?:ar\.|)|)(?:gz|bz2?))$/

    or die "could not find extension for $urls{$src}\n";

  print <<"EOF";

    ln -sv \${srcs."$src"} \$sourceRoot/src_ext/$src$ext

EOF

}

print <<'EOF';

  '';



EOF

if (defined $opt_p) {

  print "  patches = [ ";

  for my $patch (split /[, ]/, $opt_p) {

    $patch =~ s/^(?=[^\/]*$)/.\//;

    print "$patch ";

  }

  print "];\n\n";

}

print <<'EOF';

  preConfigure = ''

    substituteInPlace ./src_ext/Makefile --replace "%.stamp: %.download" "%.stamp:"

    patchShebangs src/state/shellscripts

  '';



  postConfigure = "make lib-ext";



  # Dirty, but apparently ocp-build requires a TERM

  makeFlags = ["TERM=screen"];



  outputs = [ "out" "installer" ];

  setOutputFlags = false;



  # change argv0 to "opam" as a workaround for

  # https://github.com/ocaml/opam/issues/2142

  postInstall = ''

    mv $out/bin/opam $out/bin/.opam-wrapped

    makeWrapper $out/bin/.opam-wrapped $out/bin/opam \

      --argv0 "opam" \

      --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/

    $out/bin/opam-installer --prefix=$installer opam-installer.install

  '';



  doCheck = false;



  meta = with lib; {

    description = "A package manager for OCaml";

    homepage = "https://opam.ocaml.org/";

    changelog = "https://github.com/ocaml/opam/raw/${version}/CHANGES";

    maintainers = [ ];

    license = licenses.lgpl21Only;

    platforms = platforms.all;

  };

}

EOF

print $gencmd;