Author: eelco
Date: Wed Apr 4 21:18:57 2012
New Revision: 33593
URL: https://nixos.org/websvn/nix/?rev=33593&sc=1
Log:
* Move stuff around.
Added:
release/trunk/channels/generate-linear-patch-sequence.sh
- copied unchanged from r33590,
release/trunk/patch/generate-linear-patch-sequence.sh
release/trunk/channels/generate-patches.sh
- copied unchanged from r33590, release/trunk/patch/generate-patches.sh
release/trunk/channels/mirror-nixos-isos.sh
- copied unchanged from r33560, release/trunk/mirror/mirror-nixos-isos.sh
Deleted:
release/trunk/mirror/
release/trunk/patch/
Copied: release/trunk/channels/generate-linear-patch-sequence.sh (from r33590,
release/trunk/patch/generate-linear-patch-sequence.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ release/trunk/channels/generate-linear-patch-sequence.sh Wed Apr 4
21:18:57 2012 (r33593, copy of r33590,
release/trunk/patch/generate-linear-patch-sequence.sh)
@@ -0,0 +1,17 @@
+#! /bin/sh -e
+
+releasesDir=test
+
+prev=""
+
+for i in $(cd "$releasesDir" && ls -d nixpkgs-*pre* | sort -n); do
+ if test -e "$releasesDir/$i/MANIFEST"; then
+ if test -n "$prev" -a ! -e "$releasesDir/$i/patches-created"; then
+ echo $prev "->" $i
+ date
+ time ./generate-patches.sh "$releasesDir/$prev" "$releasesDir/$i"
+ touch "$releasesDir/$i/patches-created"
+ fi
+ prev=$i
+ fi
+done
Copied: release/trunk/channels/generate-patches.sh (from r33590,
release/trunk/patch/generate-patches.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ release/trunk/channels/generate-patches.sh Wed Apr 4 21:18:57 2012
(r33593, copy of r33590, release/trunk/patch/generate-patches.sh)
@@ -0,0 +1,14 @@
+#! /bin/sh -e
+src="$1"
+dst="$2"
+
+if test ! -d "$src" -o ! -d "$dst"; then
+ echo "syntax: $0 source-dir dest-dir"
+ exit 1
+fi
+
+nix-generate-patches \
+ /data/releases/nars \
+ /data/releases/patches \
+ http://nixos.org/releases/patches \
+ "$src/MANIFEST" "$dst/MANIFEST"
Copied: release/trunk/channels/mirror-nixos-isos.sh (from r33560,
release/trunk/mirror/mirror-nixos-isos.sh)
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ release/trunk/channels/mirror-nixos-isos.sh Wed Apr 4 21:18:57 2012
(r33593, copy of r33560, release/trunk/mirror/mirror-nixos-isos.sh)
@@ -0,0 +1,57 @@
+#! /bin/sh -e
+
+# This script downloads the latest NixOS ISO images from the "tested"
+# view in Hydra to $mirrorDir (http://nixos.org/releases/nixos).
+
+curl="curl --silent --show-error --fail"
+wget="wget --no-verbose --content-disposition"
+
+mirrorDir=/data/releases/nixos
+
+url=$($curl --head http://hydra.nixos.org/view/nixos/tested/latest | sed
's/Location: \(.*\)\r/\1/; t; d')
+
+if [ -z "$url" ]; then exit 1; fi
+
+echo "View page is $url"
+
+release=$($curl $url | sed 's|<h1>View.*(<tt>\(.*\)</tt>.*|\1|; t; d')
+
+if [ -z "$release" ]; then echo "Failed to get release"; exit 1; fi
+
+echo "Release is $release"
+
+releaseDir=$mirrorDir/$release
+
+if [ -d $releaseDir ]; then
+ echo "Release already exists"
+else
+
+ tmpDir=$mirrorDir/.tmp-$release-$$
+ mkdir -p $tmpDir
+
+ $wget --directory=$tmpDir $url/tarball/download
+ $wget --directory=$tmpDir $url/iso_minimal-i686-linux/download
+ $wget --directory=$tmpDir $url/iso_minimal-x86_64-linux/download
+ $wget --directory=$tmpDir $url/iso_graphical-i686-linux/download
+ $wget --directory=$tmpDir $url/iso_graphical-x86_64-linux/download
+
+ mv $tmpDir $releaseDir
+
+fi
+
+#ln -sfn $release $mirrorDir/latest
+
+# Generate a .htaccess with some symbolic redirects to the latest version.
+htaccess=$mirrorDir/.htaccess
+
+echo "Redirect /releases/nixos/latest
http://nixos.org/releases/nixos/$release"; > $htaccess.tmp
+fn=$(cd $releaseDir && echo nixos-minimal-*-i686-linux.iso)
+echo "Redirect /releases/nixos/latest-iso-minimal-i686-linux
http://nixos.org/releases/nixos/$release/$fn"; >> $htaccess.tmp
+fn=$(cd $releaseDir && echo nixos-minimal-*-x86_64-linux.iso)
+echo "Redirect /releases/nixos/latest-iso-minimal-x86_64-linux
http://nixos.org/releases/nixos/$release/$fn"; >> $htaccess.tmp
+fn=$(cd $releaseDir && echo nixos-graphical-*-i686-linux.iso)
+echo "Redirect /releases/nixos/latest-iso-graphical-i686-linux
http://nixos.org/releases/nixos/$release/$fn"; >> $htaccess.tmp
+fn=$(cd $releaseDir && echo nixos-graphical-*-x86_64-linux.iso)
+echo "Redirect /releases/nixos/latest-iso-graphical-x86_64-linux
http://nixos.org/releases/nixos/$release/$fn"; >> $htaccess.tmp
+
+mv $htaccess.tmp $htaccess
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
