diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2014-11-05 15:00:44 +0100 |
| commit | 52404a868ddc6665da66f54dab5f102908843784 (patch) | |
| tree | da856ff0f583e67a7a209d8d75826f796df5a3bb /pkgs/build-support | |
| parent | c0e2aceef46033e43ab8b4f6aa0b36b25ba35f3d (diff) | |
| parent | 8e02bde1a8ea913ecaa4801898057968412efa01 (diff) | |
| download | nixlib-52404a868ddc6665da66f54dab5f102908843784.tar nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.gz nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.bz2 nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.lz nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.xz nixlib-52404a868ddc6665da66f54dab5f102908843784.tar.zst nixlib-52404a868ddc6665da66f54dab5f102908843784.zip | |
Merge recent master into staging
Nixpkgs Hydra: ?compare=1157272 TODO: port e22889064f82be3 Conflicts: nixos/tests/gnome3_10.nix (auto-solved) pkgs/applications/video/aegisub/default.nix pkgs/development/libraries/boost/1.55.nix
Diffstat (limited to 'pkgs/build-support')
| -rwxr-xr-x | pkgs/build-support/fetchgit/nix-prefetch-git | 5 | ||||
| -rw-r--r-- | pkgs/build-support/fetchurl/mirrors.nix | 33 |
2 files changed, 36 insertions, 2 deletions
diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index c4f9a1bf916a..ff84f5adce97 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -226,9 +226,10 @@ make_deterministic_repo(){ fi done - # Do a full repack, for determinism. - # Repack does not add unreferenced objects to a pack file. + # Do a full repack. Must run single-threaded, or else we loose determinism. + git config pack.threads 1 git repack -A -d -f + rm -f .git/config # Garbage collect unreferenced objects. git gc --prune=all diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 991b32352ffe..b54088d047d3 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -393,4 +393,37 @@ rec { http://cflags.cc/roy/ ]; + # Sage mirrors (http://www.sagemath.org/mirrors.html) + sagemath = [ + http://boxen.math.washington.edu/home/sagemath/sage-mirror/src/ + http://echidna.maths.usyd.edu.au/sage/src/ + http://ftp.iitm.ac.in/sage/src/ + http://ftp.kaist.ac.kr/sage/src/ + http://ftp.riken.jp/sagemath/src/ + http://ftp.tsukuba.wide.ad.jp/software/sage/src/ + http://jambu.spms.ntu.edu.sg/sage/src/ + http://linorg.usp.br/sage/src/ + http://mirror.aarnet.edu.au/pub/sage/src/ + http://mirror.clibre.uqam.ca/sage/src/ + http://mirror.hust.edu.cn/sagemath/src/ + http://mirror.switch.ch/mirror/sagemath/src/ + http://mirror.yandex.ru/mirrors/sage.math.washington.edu/src/ + http://mirrors.fe.up.pt/pub/sage/src/ + http://mirrors.hustunique.com/sagemath/src/ + http://mirrors.ustc.edu.cn/sagemath/src/ + http://mirrors.xmission.com/sage/src/ + http://sage.asis.io/src/ + http://sage.mirror.garr.it/mirrors/sage/src/ + http://sage.yasar.edu.tr/src/ + http://sagemath.c3sl.ufpr.br/src/ + http://sagemath.polytechnic.edu.na/src/ + http://sunsite.rediris.es/mirror/sagemath/src/ + http://www-ftp.lip6.fr/pub/math/sagemath/src/ + http://www.mirrorservice.org/sites/www.sagemath.org/src/ + + # Old versions + http://www.cecm.sfu.ca/sage/src/ + http://sagemath.org/src-old/ + ]; + } |