lol

Working on update to cling 0.9

+14 -14
+14 -14
pkgs/development/interpreters/cling/default.nix
··· 1 - { lib, stdenv 1 + { lib 2 + , stdenv 2 3 , python3 3 4 , libffi 4 5 , git 5 6 , cmake 6 7 , zlib 7 8 , fetchgit 9 + , fetchFromGitHub 8 10 , makeWrapper 9 11 , runCommand 10 - , llvmPackages_5 12 + , llvmPackages_9 11 13 , glibc 12 14 , ncurses 13 15 }: ··· 15 17 let 16 18 unwrapped = stdenv.mkDerivation rec { 17 19 pname = "cling-unwrapped"; 18 - version = "0.7"; 20 + version = "0.9"; 19 21 20 22 src = fetchgit { 21 23 url = "http://root.cern/git/clang.git"; 22 - # This commit has the tag cling-0.7 so we use it, even though cpt.py 23 - # tries to use refs/tags/cling-patches-rrelease_50 24 - rev = "354b25b5d915ff3b1946479ad07f3f2768ea1621"; 25 - branchName = "cling-patches"; 26 - sha256 = "0q8q2nnvjx3v59ng0q3qqqhzmzf4pmfqqiy3rz1f3drx5w3lgyjg"; 24 + rev = "cling-v0.9"; 25 + sha256 = "sha256-ft1NUIclSiZ9lN3Z3DJCWA0U9q/K1M0TKkZr+PjsFYk="; 27 26 }; 28 27 29 - clingSrc = fetchgit { 30 - url = "http://root.cern/git/cling.git"; 31 - rev = "70163975eee5a76b45a1ca4016bfafebc9b57e07"; 32 - sha256 = "1mv2fhk857kp5rq714bq49iv7gy9fgdwibydj5wy1kq2m3sf3ysi"; 28 + clingSrc = fetchFromGitHub { 29 + owner = "root-project"; 30 + repo = "cling"; 31 + rev = "v0.9"; 32 + sha256 = "0wx3fi19wfjcph5kclf8108i436y79ddwakrcf0lgxnnxhdjyd29"; 33 33 }; 34 34 35 35 preConfigure = '' ··· 38 38 chmod -R a+w ./tools/cling 39 39 ''; 40 40 41 - nativeBuildInputs = [ python3 git cmake llvmPackages_5.llvm.dev ]; 42 - buildInputs = [ libffi llvmPackages_5.llvm zlib ncurses ]; 41 + nativeBuildInputs = [ python3 git cmake llvmPackages_9.llvm.dev ]; 42 + buildInputs = [ libffi llvmPackages_9.llvm zlib ncurses ]; 43 43 44 44 strictDeps = true; 45 45