From 6da29419e41839822b59a6d766766531f0cd6adb Mon Sep 17 00:00:00 2001 From: orbitz Date: Fri, 8 Mar 2013 11:56:50 +0100 Subject: [PATCH 1/4] Add opam 0.9.4 --- pkgs/development/tools/ocaml/opam/0.9.4.nix | 59 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 61 insertions(+) create mode 100644 pkgs/development/tools/ocaml/opam/0.9.4.nix diff --git a/pkgs/development/tools/ocaml/opam/0.9.4.nix b/pkgs/development/tools/ocaml/opam/0.9.4.nix new file mode 100644 index 00000000000..c69d4d83626 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/0.9.4.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: + +let + srcs = { + cudf = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz"; + sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665"; + }; + extlib = fetchurl { + url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; + }; + ocaml_re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; + sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz"; + sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43"; + }; + dose3 = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz"; + sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3"; + }; + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz"; + sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; + }; + opam = fetchurl { + url = "https://github.com/OCamlPro/opam/archive/0.9.4.zip"; + sha256 = "6d86e9a64d1a1217cd81fc65ec5c41d1c1e0ff888237d819a0b17a4d3096c316"; + }; + }; +in +stdenv.mkDerivation rec { + name = "opam-0.9.4"; + + buildInputs = [unzip curl ncurses ocaml]; + + src = srcs.opam; + + postUnpack = '' + ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} + ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} + ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} + ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} + ''; + + makeFlags = ["HOME=$(TMPDIR)"]; + + doCheck = false; + + meta = { + description = "A package manager for ocaml"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4bb08128798..00ecacc1245 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2624,6 +2624,8 @@ let ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; + + opam = callPackage ../development/tools/ocaml/opam/0.9.4.nix { }; }; ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; From fd48192018f1ef14fd2eec6820e7d5f9deb15dce Mon Sep 17 00:00:00 2001 From: orbitz Date: Fri, 8 Mar 2013 22:42:22 +0100 Subject: [PATCH 2/4] Add opam 0.9.5 --- pkgs/development/tools/ocaml/opam/default.nix | 59 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 60 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/ocaml/opam/default.nix diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix new file mode 100644 index 00000000000..670c37a4e93 --- /dev/null +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: + +let + srcs = { + cudf = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz"; + sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665"; + }; + extlib = fetchurl { + url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; + sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; + }; + ocaml_re = fetchurl { + url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; + sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; + }; + ocamlgraph = fetchurl { + url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz"; + sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43"; + }; + dose3 = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz"; + sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3"; + }; + cmdliner = fetchurl { + url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz"; + sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; + }; + opam = fetchurl { + url = "https://github.com/OCamlPro/opam/archive/0.9.5.zip"; + sha256 = "2ec706330a3283b4d057abc562c6078351988d0ae98ad507fe51cae598b43afd"; + }; + }; +in +stdenv.mkDerivation rec { + name = "opam-0.9.5"; + + buildInputs = [unzip curl ncurses ocaml]; + + src = srcs.opam; + + postUnpack = '' + ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} + ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} + ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} + ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} + ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} + ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} + ''; + + makeFlags = ["HOME=$(TMPDIR)"]; + + doCheck = false; + + meta = { + description = "A package manager for ocaml"; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 00ecacc1245..0fd838763dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2625,7 +2625,7 @@ let pycaml = callPackage ../development/ocaml-modules/pycaml { }; - opam = callPackage ../development/tools/ocaml/opam/0.9.4.nix { }; + opam = callPackage ../development/tools/ocaml/opam { }; }; ocamlPackages = recurseIntoAttrs ocamlPackages_3_12_1; From 98a6759bc78e0431a247843c839ca756ac0ce6bd Mon Sep 17 00:00:00 2001 From: orbitz Date: Fri, 8 Mar 2013 22:48:58 +0100 Subject: [PATCH 3/4] Delete 0.9.4 --- pkgs/development/tools/ocaml/opam/0.9.4.nix | 59 --------------------- 1 file changed, 59 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/opam/0.9.4.nix diff --git a/pkgs/development/tools/ocaml/opam/0.9.4.nix b/pkgs/development/tools/ocaml/opam/0.9.4.nix deleted file mode 100644 index c69d4d83626..00000000000 --- a/pkgs/development/tools/ocaml/opam/0.9.4.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, fetchgit, fetchurl, ocaml, unzip, ncurses, curl }: - -let - srcs = { - cudf = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/31910/cudf-0.6.3.tar.gz"; - sha256 = "6e9f1bafe859df85c854679e2904a8172945d2bf2d676c8ae3ecb72fe6de0665"; - }; - extlib = fetchurl { - url = "http://ocaml-extlib.googlecode.com/files/extlib-1.5.3.tar.gz"; - sha256 = "c095eef4202a8614ff1474d4c08c50c32d6ca82d1015387785cf03d5913ec021"; - }; - ocaml_re = fetchurl { - url = "https://github.com/ocaml/ocaml-re/archive/ocaml-re-1.2.0.tar.gz"; - sha256 = "a34dd9d6136731436a963bbab5c4bbb16e5d4e21b3b851d34887a3dec451999f"; - }; - ocamlgraph = fetchurl { - url = "http://ocamlgraph.lri.fr/download/ocamlgraph-1.8.1.tar.gz"; - sha256 = "ba6388ffc2c15139b0f26330ef6dd922f0ff0f364eee99a3202bf1cd93512b43"; - }; - dose3 = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/31595/dose3-3.1.2.tar.gz"; - sha256 = "3a07a08345be157c98cb26021d7329c72c2b95c99cfdff79887690656ec9f1a3"; - }; - cmdliner = fetchurl { - url = "http://erratique.ch/software/cmdliner/releases/cmdliner-0.9.3.tbz"; - sha256 = "5421559aa12b4debffef947f7e1039c22e9dffd87a4aa68445a687a20764ae81"; - }; - opam = fetchurl { - url = "https://github.com/OCamlPro/opam/archive/0.9.4.zip"; - sha256 = "6d86e9a64d1a1217cd81fc65ec5c41d1c1e0ff888237d819a0b17a4d3096c316"; - }; - }; -in -stdenv.mkDerivation rec { - name = "opam-0.9.4"; - - buildInputs = [unzip curl ncurses ocaml]; - - src = srcs.opam; - - postUnpack = '' - ln -sv ${srcs.cudf} $sourceRoot/src_ext/${srcs.cudf.name} - ln -sv ${srcs.extlib} $sourceRoot/src_ext/${srcs.extlib.name} - ln -sv ${srcs.ocaml_re} $sourceRoot/src_ext/${srcs.ocaml_re.name} - ln -sv ${srcs.ocamlgraph} $sourceRoot/src_ext/${srcs.ocamlgraph.name} - ln -sv ${srcs.dose3} $sourceRoot/src_ext/${srcs.dose3.name} - ln -sv ${srcs.cmdliner} $sourceRoot/src_ext/${srcs.cmdliner.name} - ''; - - makeFlags = ["HOME=$(TMPDIR)"]; - - doCheck = false; - - meta = { - description = "A package manager for ocaml"; - platforms = stdenv.lib.platforms.all; - }; -} From 55be059467ce77ae48298d97b48df803093b0c39 Mon Sep 17 00:00:00 2001 From: orbitz Date: Fri, 8 Mar 2013 22:51:34 +0100 Subject: [PATCH 4/4] Add myself to maintainers, remove 0.9.4, set maintainer for this packge to me --- pkgs/development/tools/ocaml/opam/default.nix | 3 ++- pkgs/lib/maintainers.nix | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/ocaml/opam/default.nix b/pkgs/development/tools/ocaml/opam/default.nix index 670c37a4e93..714c5aca686 100644 --- a/pkgs/development/tools/ocaml/opam/default.nix +++ b/pkgs/development/tools/ocaml/opam/default.nix @@ -53,7 +53,8 @@ stdenv.mkDerivation rec { doCheck = false; meta = { + maintainers = stdenv.lib.maintainers.orbitz; description = "A package manager for ocaml"; - platforms = stdenv.lib.platforms.all; + platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index 76aa2de723d..a2e8b50c10e 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -27,6 +27,7 @@ marcweber = "Marc Weber "; mornfall = "Petr Ročkai "; neznalek = "Vladimír Čunát "; + orbitz = "Malcolm Matalka "; page = "Carles Pagès "; phreedom = "Evgeny Egorochkin "; pierron = "Nicolas B. Pierron ";