From de84782dedffc177043775e3fc0f5790cc4a7628 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 7 Sep 2015 22:07:54 +0200 Subject: ocaml-deriving: drop legacy package --- pkgs/development/tools/ocaml/deriving/default.nix | 72 ----------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 74 deletions(-) delete mode 100644 pkgs/development/tools/ocaml/deriving/default.nix diff --git a/pkgs/development/tools/ocaml/deriving/default.nix b/pkgs/development/tools/ocaml/deriving/default.nix deleted file mode 100644 index 55bbf3748ea9..000000000000 --- a/pkgs/development/tools/ocaml/deriving/default.nix +++ /dev/null @@ -1,72 +0,0 @@ -{stdenv, fetchurl, zlib, ocaml, findlib, ncurses -, versionedDerivation, unzip -, version ? - let match = { - "ocaml-3.10.0" = "for-3.10.0"; - "ocaml-3.12.1" = "for-3.12.1"; - }; in stdenv.lib.maybeAttr ocaml.name (throw "no matching source of ocaml-deriving for ocaml version: ${ocaml.name}") match -}: - -/* -Usage example: - -== main.ml == -type t = | A | B - deriving (Show) - -print_string (Show.show (A));; -== - -ocamlopt -pp $out/bin/deriving -I $d/lib -I $d/syntax nums.cmxa show.cmx main.ml -*/ - -versionedDerivation "ocaml-deriving" version { - - "for-3.10.0" = { - name = "deriving-0.1.1a"; - # ocaml: 3.10.0 - src = fetchurl { - url = https://deriving.googlecode.com/files/deriving-0.1.1a.tar.gz; - sha256 = "0ppmqhc23kccfjn3cnd9n205ky627ni8f5djf8sppmc3lc1m97mb"; - }; - }; - - "for-3.12.1" = { - name = "deriving-git20100903"; - - # https://github.com/jaked/deriving - src = fetchurl { - name = "for-3.12.0.zip"; - url = https://codeload.github.com/jaked/deriving/zip/c7b9cea3eb4bbfb9e09673faf725f70247c9df78; - sha256 = "1zrmpqb5lsjmizqs68czmfpsbz9hz30pf97w11kkby175hhj84gi"; - }; - - buildInputs = [ unzip ]; - }; - -} -{ - buildInputs = [ocaml findlib]; - - installPhase = '' - # not all tests compile !? - # (cd tests; make) - - mkdir -p $out/bin - cp -a lib $out/ - cp -a syntax $out - - # this allows -pp deriving - ln -s $out/syntax/deriving $out/bin/deriving - ''; - - meta = { - homepage = "https://code.google.com/p/deriving/source/checkout"; - description = "A library of cryptographic primitives for OCaml"; - license = stdenv.lib.licenses.mit; - platforms = ocaml.meta.platforms; - maintainers = [ - stdenv.lib.maintainers.z77z - ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9d77849bbb77..2292307f8986 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4357,8 +4357,6 @@ let ctypes = callPackage ../development/ocaml-modules/ctypes { }; - deriving = callPackage ../development/tools/ocaml/deriving { }; - dolog = callPackage ../development/ocaml-modules/dolog { }; easy-format = callPackage ../development/ocaml-modules/easy-format { }; -- cgit 1.4.1 From 67e38dfe23ba03ee42c478c6858bafd6f0fc1f9b Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 17 Jun 2015 23:22:00 +0200 Subject: ocaml: 4.02.1 -> 4.02.2 --- pkgs/development/compilers/ocaml/4.02.1.nix | 84 ----------------------------- pkgs/development/compilers/ocaml/4.02.nix | 84 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 10 ++-- 3 files changed, 89 insertions(+), 89 deletions(-) delete mode 100644 pkgs/development/compilers/ocaml/4.02.1.nix create mode 100644 pkgs/development/compilers/ocaml/4.02.nix diff --git a/pkgs/development/compilers/ocaml/4.02.1.nix b/pkgs/development/compilers/ocaml/4.02.1.nix deleted file mode 100644 index d70fe3384e03..000000000000 --- a/pkgs/development/compilers/ocaml/4.02.1.nix +++ /dev/null @@ -1,84 +0,0 @@ -let - safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); -in - -{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }: - -assert useX11 -> !stdenv.isArm && !stdenv.isMips; - -let - useNativeCompilers = !stdenv.isMips; - inherit (stdenv.lib) optionals optionalString; - patchOcamlBuild = fetchurl { - url = https://github.com/ocaml/ocaml/pull/117.patch; - sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0"; - }; -in - -stdenv.mkDerivation rec { - - x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; - x11lib = x11env + "/lib"; - x11inc = x11env + "/include"; - - name = "ocaml-4.02.1"; - - src = fetchurl { - url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz"; - sha256 = "1p7lqvh64xpykh99014mz21q8fs3qyjym2qazhhbq8scwldv1i38"; - }; - - patches = [ patchOcamlBuild ]; - - prefixKey = "-prefix "; - configureFlags = optionals useX11 [ "-x11lib" x11lib - "-x11include" x11inc ]; - - buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; - buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; - installTargets = "install" + optionalString useNativeCompilers " installopt"; - preConfigure = '' - CAT=$(type -tp cat) - sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang - ''; - postBuild = '' - mkdir -p $out/include - ln -sv $out/lib/ocaml/caml $out/include/caml - ''; - - passthru = { - nativeCompilers = useNativeCompilers; - }; - - meta = with stdenv.lib; { - homepage = http://caml.inria.fr/ocaml; - branch = "4.02"; - license = with licenses; [ - qpl /* compiler */ - lgpl2 /* library */ - ]; - description = "Most popular variant of the Caml language"; - - longDescription = - '' - OCaml is the most popular variant of the Caml language. From a - language standpoint, it extends the core Caml language with a - fully-fledged object-oriented layer, as well as a powerful module - system, all connected by a sound, polymorphic type system featuring - type inference. - - The OCaml system is an industrial-strength implementation of this - language, featuring a high-performance native-code compiler (ocamlopt) - for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, - Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) - and an interactive read-eval-print loop (ocaml) for quick development - and portability. The OCaml distribution includes a comprehensive - standard library, a replay debugger (ocamldebug), lexer (ocamllex) and - parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) - and a documentation generator (ocamldoc). - ''; - - platforms = with platforms; linux ++ darwin; - }; - -} diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix new file mode 100644 index 000000000000..2aa4c06ef0a2 --- /dev/null +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -0,0 +1,84 @@ +let + safeX11 = stdenv: !(stdenv.isArm || stdenv.isMips); +in + +{ stdenv, fetchurl, ncurses, buildEnv, libX11, xproto, useX11 ? safeX11 stdenv }: + +assert useX11 -> !stdenv.isArm && !stdenv.isMips; + +let + useNativeCompilers = !stdenv.isMips; + inherit (stdenv.lib) optionals optionalString; + patchOcamlBuild = fetchurl { + url = https://github.com/ocaml/ocaml/pull/117.patch; + sha256 = "0x2cdn2sgzq29qzqg5y2ial0jqy8gjg5a7jf8qqch55dc4vkyjw0"; + }; +in + +stdenv.mkDerivation rec { + + x11env = buildEnv { name = "x11env"; paths = [libX11 xproto]; }; + x11lib = x11env + "/lib"; + x11inc = x11env + "/include"; + + name = "ocaml-4.02.2"; + + src = fetchurl { + url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz"; + sha256 = "119h6vm8i0icz40ckqky43w6nivsgnfnkycr0wx05bmpiac27yb0"; + }; + + patches = [ patchOcamlBuild ]; + + prefixKey = "-prefix "; + configureFlags = optionals useX11 [ "-x11lib" x11lib + "-x11include" x11inc ]; + + buildFlags = "world" + optionalString useNativeCompilers " bootstrap world.opt"; + buildInputs = [ncurses] ++ optionals useX11 [ libX11 xproto ]; + installTargets = "install" + optionalString useNativeCompilers " installopt"; + preConfigure = '' + CAT=$(type -tp cat) + sed -e "s@/bin/cat@$CAT@" -i config/auto-aux/sharpbang + ''; + postBuild = '' + mkdir -p $out/include + ln -sv $out/lib/ocaml/caml $out/include/caml + ''; + + passthru = { + nativeCompilers = useNativeCompilers; + }; + + meta = with stdenv.lib; { + homepage = http://caml.inria.fr/ocaml; + branch = "4.02"; + license = with licenses; [ + qpl /* compiler */ + lgpl2 /* library */ + ]; + description = "Most popular variant of the Caml language"; + + longDescription = + '' + OCaml is the most popular variant of the Caml language. From a + language standpoint, it extends the core Caml language with a + fully-fledged object-oriented layer, as well as a powerful module + system, all connected by a sound, polymorphic type system featuring + type inference. + + The OCaml system is an industrial-strength implementation of this + language, featuring a high-performance native-code compiler (ocamlopt) + for 9 processor architectures (IA32, PowerPC, AMD64, Alpha, Sparc, + Mips, IA64, HPPA, StrongArm), as well as a bytecode compiler (ocamlc) + and an interactive read-eval-print loop (ocaml) for quick development + and portability. The OCaml distribution includes a comprehensive + standard library, a replay debugger (ocamldebug), lexer (ocamllex) and + parser (ocamlyacc) generators, a pre-processor pretty-printer (camlp4) + and a documentation generator (ocamldoc). + ''; + + platforms = with platforms; linux ++ darwin; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2292307f8986..724ac268a5f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4215,7 +4215,7 @@ let ocaml_4_01_0 = callPackage ../development/compilers/ocaml/4.01.0.nix { }; - ocaml_4_02_1 = callPackage ../development/compilers/ocaml/4.02.1.nix { }; + ocaml_4_02 = callPackage ../development/compilers/ocaml/4.02.nix { }; orc = callPackage ../development/compilers/orc { }; @@ -4654,8 +4654,8 @@ let // { camlimages = ocamlPackages_3_12_1.camlimages_4_0; }; ocamlPackages_4_00_1 = mkOcamlPackages ocaml_4_00_1 pkgs.ocamlPackages_4_00_1; ocamlPackages_4_01_0 = mkOcamlPackages ocaml_4_01_0 pkgs.ocamlPackages_4_01_0; - ocamlPackages_4_02_1 = mkOcamlPackages ocaml_4_02_1 pkgs.ocamlPackages_4_02_1; - ocamlPackages_latest = ocamlPackages_4_02_1; + ocamlPackages_4_02 = mkOcamlPackages ocaml_4_02 pkgs.ocamlPackages_4_02; + ocamlPackages_latest = ocamlPackages_4_02; ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; @@ -11957,8 +11957,8 @@ let }; llpp = callPackage ../applications/misc/llpp { - inherit (ocamlPackages_4_02_1) lablgl findlib; - ocaml = ocaml_4_02_1; + inherit (ocamlPackages_4_02) lablgl findlib; + ocaml = ocaml_4_02; }; lmms = callPackage ../applications/audio/lmms { }; -- cgit 1.4.1 From 9fa9c87485d433a761b5a6a8406a92fb2f36a343 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 27 Jul 2015 17:39:49 +0200 Subject: ocaml: 4.02.2 -> 4.02.3 --- pkgs/development/compilers/ocaml/4.02.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.02.nix b/pkgs/development/compilers/ocaml/4.02.nix index 2aa4c06ef0a2..7338f8b36745 100644 --- a/pkgs/development/compilers/ocaml/4.02.nix +++ b/pkgs/development/compilers/ocaml/4.02.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { x11lib = x11env + "/lib"; x11inc = x11env + "/include"; - name = "ocaml-4.02.2"; + name = "ocaml-4.02.3"; src = fetchurl { url = "http://caml.inria.fr/pub/distrib/ocaml-4.02/${name}.tar.xz"; - sha256 = "119h6vm8i0icz40ckqky43w6nivsgnfnkycr0wx05bmpiac27yb0"; + sha256 = "1qwwvy8nzd87hk8rd9sm667nppakiapnx4ypdwcrlnav2dz6kil3"; }; patches = [ patchOcamlBuild ]; -- cgit 1.4.1