fetch-kde-qt.sh: modularize script allowing multiple versions

maintainers/scripts/fetch-kde-qt.sh

@@ -1,9 +1,18 @@
 #! /usr/bin/env nix-shell
 #! nix-shell -i bash -p coreutils findutils gnused nix wget
 
+SRCS=
+if [ -d "$1" ]; then
+    SRCS="$(pwd)/$1/srcs.nix"
+    . "$1/fetch.sh"
+else
+    SRCS="$(pwd)/$(dirname $1)/srcs.nix"
+    . "$1"
+fi
+
 tmp=$(mktemp -d)
 pushd $tmp >/dev/null
-wget -nH -r -c --no-parent "$@" >/dev/null
+wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null
 
 csv=$(mktemp)
 find . -type f | while read src; do
@@ -15,8 +24,8 @@ find . -type f | while read src; do
     echo "$name,$version,$src,$filename" >>$csv
 done
 
-cat <<EOF
+cat >"$SRCS" <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
+# DO NOT EDIT! This file is generated automatically by fetch-kde-qt.sh
 { fetchurl, mirror }:
 
 {
@@ -29,7 +38,7 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
     filename=$(gawk -F , "/^$name,$latestVersion,/ { print \$4 }" $csv)
     url="${src:2}"
     sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-    cat <<EOF
+    cat >>"$SRCS" <<EOF
   $name = {
     version = "$latestVersion";
     src = fetchurl {
@@ -41,7 +50,7 @@ gawk -F , "{ print \$1 }" $csv | sort | uniq | while read name; do
 EOF
 done
 
-echo "}"
+echo "}" >>"$SRCS"
 
 popd >/dev/null
 rm -fr $tmp >/dev/null

maintainers/scripts/generate-kde-applications.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./maintainers/scripts/fetch-kde-qt.sh \
-    http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' \
-    >pkgs/desktops/kde-5/applications/srcs.nix

maintainers/scripts/generate-kde-frameworks.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./maintainers/scripts/fetch-kde-qt.sh \
-    http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' \
-    >pkgs/desktops/kde-5/frameworks/srcs.nix

maintainers/scripts/generate-kde-plasma.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-./maintainers/scripts/fetch-kde-qt.sh \
-    http://download.kde.org/stable/plasma/5.7.3/ -A '*.tar.xz' \
-    >pkgs/desktops/kde-5/plasma/srcs.nix

maintainers/scripts/generate-qt.sh

@@ -1,6 +0,0 @@
-#!/bin/sh
-
-./maintainers/scripts/fetch-kde-qt.sh \
-    http://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/ \
-    -A '*.tar.xz' \
-    >pkgs/development/libraries/qt-5/5.7/srcs.nix

pkgs/desktops/kde-5/applications/fetch.sh

@@ -0,0 +1 @@
+WGET_ARGS=( http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' )

pkgs/desktops/kde-5/plasma/fetch.sh

@@ -0,0 +1 @@
+WGET_ARGS=( http://download.kde.org/stable/plasma/5.7.4/ -A '*.tar.xz' )

pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix

@@ -1,16 +0,0 @@
-{ plasmaPackage, ecm, baloo, kactivities, kconfig
-, kcoreaddons, kdeclarative, kguiaddons, ki18n, kio, kservice
-, kfilemetadata, plasma-framework, qtdeclarative, qtmultimedia
-, taglib
-}:
-
-plasmaPackage rec {
-  name = "plasma-mediacenter";
-  nativeBuildInputs = [
-    ecm
-  ];
-  propagatedBuildInputs = [
-    baloo kactivities kdeclarative kfilemetadata ki18n kio plasma-framework
-    kconfig kcoreaddons kguiaddons kservice qtdeclarative qtmultimedia taglib
-  ];
-}

pkgs/development/libraries/kde-frameworks/fetch.sh

@@ -0,0 +1 @@
+WGET_ARGS=( http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' )

pkgs/development/libraries/qt-5/5.5/fetch.sh

@@ -0,0 +1,3 @@
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.5/5.5.1/submodules/ \
+            http://download.qt.io/community_releases/5.5/5.5.1/ \
+            -A '*.tar.xz' )

pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh

@@ -1,54 +0,0 @@
-#! /usr/bin/env nix-shell
-#! nix-shell -i bash -p coreutils findutils gnused nix wget
-
-set -x
-
-MAJOR_VERSION="5.5"
-VERSION="${MAJOR_VERSION}.1"
-# The trailing slash at the end is necessary!
-RELEASE_URLS=(
-    "http://download.qt.io/official_releases/qt/$MAJOR_VERSION/$VERSION/submodules/"
-    "http://download.qt.io/community_releases/$MAJOR_VERSION/$VERSION/"
-)
-EXTRA_WGET_ARGS='-A *.tar.xz'
-
-mkdir tmp; cd tmp
-
-for url in "${RELEASE_URLS[@]}"; do
-    wget -nH -r -c --no-parent $url $EXTRA_WGET_ARGS
-done
-
-cat >../srcs.nix <<EOF
-# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh
-{ fetchurl, mirror }:
-
-{
-EOF
-
-workdir=$(pwd)
-
-find . | sort | while read src; do
-    if [[ -f "${src}" ]]; then
-        url="${src:2}"
-        # Sanitize file name
-        filename=$(basename "$src" | tr '@' '_')
-        nameversion="${filename%.tar.*}"
-        name=$(echo "$nameversion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,')
-        version=$(echo "$nameversion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,')
-        sha256=$(nix-hash --type sha256 --base32 --flat "$src")
-        cat >>../srcs.nix <<EOF
-  $name = {
-    version = "$version";
-    src = fetchurl {
-      url = "\${mirror}/$url";
-      sha256 = "$sha256";
-      name = "$filename";
-    };
-  };
-EOF
-    fi
-done
-
-echo "}" >>../srcs.nix
-
-cd ..

pkgs/development/libraries/qt-5/5.6/fetch.sh

@@ -0,0 +1,3 @@
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.6/5.6.1-1/submodules/ \
+            http://download.qt.io/community_releases/5.6/5.6.1/ \
+            -A '*.tar.xz' )

pkgs/development/libraries/qt-5/5.7/fetch.sh

@@ -0,0 +1,2 @@
+WGET_ARGS=( http://download.qt.io/official_releases/qt/5.7/5.7.0/submodules/ \
+            -A '*.tar.xz' )