Merge branch 'fix-build' into 'static-code-analysis-kernel-task-memory-safety'
build: use working texlive mirror See merge request !4
This commit is contained in:
commit
1f4d579dcc
2 changed files with 43 additions and 6 deletions
27
build/texlive-url-mirror.patch
Normal file
27
build/texlive-url-mirror.patch
Normal file
|
@ -0,0 +1,27 @@
|
||||||
|
diff --git a/pkgs/tools/typesetting/tex/texlive/bin.nix b/pkgs/tools/typesetting/tex/texlive/bin.nix
|
||||||
|
index 5591f64cee..2bdbfd50a7 100644
|
||||||
|
--- a/pkgs/tools/typesetting/tex/texlive/bin.nix
|
||||||
|
+++ b/pkgs/tools/typesetting/tex/texlive/bin.nix
|
||||||
|
@@ -20,7 +20,7 @@ let
|
||||||
|
common = rec {
|
||||||
|
src = fetchurl {
|
||||||
|
url = # "ftp://tug.org/historic/systems/texlive/${year}/"
|
||||||
|
- "http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016" # FIXME: a proper mirror
|
||||||
|
+ "http://146.185.144.154/texlive-2016/"
|
||||||
|
+ "/texlive-${year}0523b-source.tar.xz";
|
||||||
|
sha256 = "1v91vahxlxkdra0qz3f132vvx5d9cx2jy84yl1hkch0agyj2rcx8";
|
||||||
|
};
|
||||||
|
diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix
|
||||||
|
index 692f6b1772..21463dc367 100644
|
||||||
|
--- a/pkgs/tools/typesetting/tex/texlive/default.nix
|
||||||
|
+++ b/pkgs/tools/typesetting/tex/texlive/default.nix
|
||||||
|
@@ -109,8 +109,7 @@ let
|
||||||
|
fixedHash = fixedHashes.${tlName} or null; # be graceful about missing hashes
|
||||||
|
|
||||||
|
url = args.url or "${urlPrefix}/${urlName}.tar.xz";
|
||||||
|
- urlPrefix = args.urlPrefix or
|
||||||
|
- http://lipa.ms.mff.cuni.cz/~cunav5am/nix/texlive-2016;
|
||||||
|
+ urlPrefix = http://146.185.144.154/texlive-2016;
|
||||||
|
# XXX XXX XXX FIXME: mirror the snapshot XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX XXX
|
||||||
|
# ("${mirror}/pub/tex/historic/systems/texlive/${bin.texliveYear}/tlnet-final/archive");
|
||||||
|
#mirror = "http://ftp.math.utah.edu";
|
22
shell.nix
22
shell.nix
|
@ -1,12 +1,22 @@
|
||||||
let
|
let
|
||||||
nixpkgs = import <nixpkgs> {};
|
nixpkgs = import <nixpkgs> {};
|
||||||
pkgsSrc = nixpkgs.pkgs.fetchFromGitHub {
|
patchedPkgsSrc = nixpkgs.stdenv.mkDerivation {
|
||||||
owner = "nixos";
|
name = "patchedPkgsSrc";
|
||||||
repo = "nixpkgs-channels";
|
src = nixpkgs.pkgs.fetchFromGitHub {
|
||||||
rev = "b0d07aa894007a52466b06eced06c1eee469ee1c";
|
owner = "nixos";
|
||||||
sha256 = "0cnwy3ivjz8z8jd5vvx4m5v76vzwq9hh7vh6gah83x47ggipk7ii";
|
repo = "nixpkgs-channels";
|
||||||
|
rev = "81fceb255448415e70b9e7775d590b6def45f861";
|
||||||
|
sha256 = "0sfx21b9rb6qxjm7li3krk6ik0xxph1il7r5l69n8b9agp72yjfx";
|
||||||
|
};
|
||||||
|
patches = [ ./build/texlive-url-mirror.patch ];
|
||||||
|
buildPhase = "";
|
||||||
|
installPhase = ''
|
||||||
|
cp -a . $out
|
||||||
|
'';
|
||||||
|
fixupPhase = "true";
|
||||||
|
postFixup = "true";
|
||||||
};
|
};
|
||||||
pkgs = import pkgsSrc {};
|
pkgs = import patchedPkgsSrc {};
|
||||||
|
|
||||||
mytexlive = (pkgs.texlive.combine {
|
mytexlive = (pkgs.texlive.combine {
|
||||||
inherit (pkgs.texlive) scheme-full;
|
inherit (pkgs.texlive) scheme-full;
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue