diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-02-06 23:03:12 +0000 |
commit | 215a07c1a9d6d208c1ba0037eccaaba7de9d6b68 (patch) | |
tree | f31e835b16c30957eb4ae3710cbfa922e8a64fbd /pkgs/applications/science | |
parent | b31c67e24d56c90a6732d3a310ff13684b73e200 (diff) | |
parent | 4e3dcd925499547314567107366cae26a99c4ef7 (diff) | |
download | nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.gz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.bz2 nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.lz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.xz nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.tar.zst nixlib-215a07c1a9d6d208c1ba0037eccaaba7de9d6b68.zip |
svn merge ^/nixpkgs/trunk
Merge conflicts: * unzip (almost trivial) * dvswitch (trivial) * gmp (copied result of `git merge`) The last item introduced gmp-5.0.3, thus full rebuild. +ensureDir->mkdir -p in TeX packages was catched by git but not svn. svn path=/nixpkgs/branches/stdenv-updates/; revision=32091
Diffstat (limited to 'pkgs/applications/science')
-rw-r--r-- | pkgs/applications/science/logic/hol_light/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 0e688e71a2e5..88f3f788376c 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -9,11 +9,11 @@ let in stdenv.mkDerivation { - name = "hol_light-20120109"; + name = "hol_light-20120129"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; - rev = "118"; - sha256 = "97e72dad731338328c031421512c26d440a989ea083f3ae34820eb8413aff495"; + rev = "122"; + sha256 = "d837ba5fe941af9595540691ba4be34e58174ba9a9c7e1ce57620e5cd4385769"; }; buildInputs = [ ocaml findlib camlp5 ]; |