From 3481bfaf402a894e6638b4416bac6c721a74dee1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 10 Sep 2014 12:05:26 +0000 Subject: [PATCH] * Fix Nixpkgs manual mirroring. git-svn-id: https://nixos.org/repos/nix/release/trunk/channels@34857 70bd8c7a-acb8-0310-9f0d-9cc1c95dcdbb --- delete-old-releases.sh | 2 +- mirror-nixpkgs.sh | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/delete-old-releases.sh b/delete-old-releases.sh index c622040..4243bbd 100755 --- a/delete-old-releases.sh +++ b/delete-old-releases.sh @@ -12,7 +12,7 @@ find /data/releases/nixos/ /data/releases/nixpkgs/ -maxdepth 1 -name ".tmp*" -mt done # Remove old NixOS releases. -find /data/releases/nixos/unstable/ /data/releases/nixos/??.??/ -maxdepth 1 -name "nixos-*pre*" -mtime +14 | sort | while read rel; do +find /data/releases/nixos/unstable/ /data/releases/nixos/??.??/ -maxdepth 1 -name "nixos-*pre*" -mtime +7 | sort | while read rel; do if [ -e $rel/keep ]; then echo "keeping NixOS release $rel" >&2 continue diff --git a/mirror-nixpkgs.sh b/mirror-nixpkgs.sh index ea15ca5..486321a 100755 --- a/mirror-nixpkgs.sh +++ b/mirror-nixpkgs.sh @@ -34,9 +34,9 @@ else /data/releases/patches/all-patches "$url/job/tarball/download/1" # Extract the manual. - mkdir $tmpDir/manual - tar xf $tmpDir/nixexprs.tar.xz --strip-components=2 -C $tmpDir/manual \ - --wildcards '*/doc' --exclude '*.xml' --exclude '*.xsl' --exclude '*.txt' --exclude 'Makefile' + $curl -L $url/job/manual/output/out | bzip2 -d | nix-store --restore $tmpDir/foo + mv $tmpDir/foo/share/doc/nixpkgs $tmpDir/manual + rm -rf $tmpDir/foo ln -s manual.html $tmpDir/manual/index.html mv $tmpDir $releaseDir