From 8dca34b5ed73bdb708d48151d7f17f9c276c6443 Mon Sep 17 00:00:00 2001 From: Marco Maggesi Date: Tue, 3 Aug 2010 17:39:12 +0000 Subject: [PATCH] Upgrade dmtcp to version 1.1.8 svn path=/nixpkgs/trunk/; revision=22933 --- pkgs/os-specific/linux/dmtcp/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 6 +----- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/os-specific/linux/dmtcp/default.nix b/pkgs/os-specific/linux/dmtcp/default.nix index f2ff4a66a42..ee32654cf8a 100644 --- a/pkgs/os-specific/linux/dmtcp/default.nix +++ b/pkgs/os-specific/linux/dmtcp/default.nix @@ -4,7 +4,7 @@ let pname = "dmtcp"; - version = "1.1.4"; + version = "1.1.8"; in stdenv.mkDerivation { @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${pname}/${pname}_${version}.tar.gz"; - sha256 = "0asqzndy4is285rmd1dw406ar3wkfaaw9ivyrmhx2w5lwf4gl7sk"; + sha256 = "05klyml5maw3f5rxl3i20fqyvpmx69bh09h7a48y19q3r4nqd8f2"; }; buildInputs = [ perl python ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 58be4e57976..e144bed643b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4268,8 +4268,6 @@ let dmtcp = callPackage ../os-specific/linux/dmtcp { }; - dmtcp_devel = callPackage ../os-specific/linux/dmtcp/devel.nix { }; - dietlibc = callPackage ../os-specific/linux/dietlibc { # Dietlibc 0.30 doesn't compile on PPC with GCC 4.1, bus GCC 3.4 works. stdenv = if stdenv.system == "powerpc-linux" then overrideGCC stdenv gcc34 else stdenv; @@ -6671,9 +6669,7 @@ let hol_light = callPackage ../applications/science/logic/hol_light { }; - hol_light_binaries = callPackage ../applications/science/logic/hol_light/binaries.nix { - dmtcp = dmtcp_devel; - }; + hol_light_binaries = callPackage ../applications/science/logic/hol_light/binaries.nix { }; # This is a special version of OCaml handcrafted especially for # hol_light it should be merged with the current expresion for ocaml