diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:35:03 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2016-04-07 14:40:51 +0200 |
commit | d1df28f8e5b98be01417ffc1032020415390f2a0 (patch) | |
tree | 0e2024acd74c6ce3fb4614eadb04abe632835f71 /pkgs/development/compilers/tinycc | |
parent | 056b5a1a5f2a4096dd39db2265e5ca369c03ec15 (diff) | |
parent | c55cfe0cb3425fb926219cf7dde8714f3d143744 (diff) | |
download | nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.gz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.bz2 nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.lz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.xz nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.tar.zst nixpkgs-d1df28f8e5b98be01417ffc1032020415390f2a0.zip |
Merge 'staging' into closure-size
This is mainly to get the update of bootstrap tools. Otherwise there were mysterious segfaults: https://github.com/NixOS/nixpkgs/pull/7701#issuecomment-203389817
Diffstat (limited to 'pkgs/development/compilers/tinycc')
-rw-r--r-- | pkgs/development/compilers/tinycc/default.nix | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 9da1ef0dd9a..fbadb9d7436 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -1,13 +1,19 @@ -{ stdenv, fetchurl, perl, texinfo }: +{ stdenv, fetchurl, fetchgit, perl, texinfo }: assert stdenv ? glibc; stdenv.mkDerivation rec { - name = "tcc-0.9.26"; - - src = fetchurl { - url = "mirror://savannah/tinycc/${name}.tar.bz2"; - sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj"; + #name = "tcc-0.9.26"; + name = "tcc-git-0.9.27pre-20160328"; + + #src = fetchurl { + # url = "mirror://savannah/tinycc/${name}.tar.bz2"; + # sha256 = "0wbdbdq6090ayw8bxnbikiv989kykff3m5rzbia05hrnwhd707jj"; + #}; + src = fetchgit { + url = "git://repo.or.cz/tinycc.git"; + rev = "80343ab7d829c21c65f8f9a14dd20158d028549f"; + sha256 = "1bz75aj93ivb2d8hfk2bczsrwa56lv7vprvdi8c1r5phjvawbshy"; }; nativeBuildInputs = [ perl texinfo ]; |