diff options
author | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-25 10:06:23 -0500 |
---|---|---|
committer | Thomas Tuegel <ttuegel@gmail.com> | 2016-08-25 10:07:03 -0500 |
commit | f4bb247bd63762fb431fc8ec60ccf8fc4f63aeed (patch) | |
tree | 6e2ccd59150a89a81cdda1c403edefb3b529c55f | |
parent | b71d71c576df3dbac8af76241260246010e08536 (diff) |
fetch-kde-qt.sh: modularize script allowing multiple versions
-rwxr-xr-x | maintainers/scripts/fetch-kde-qt.sh | 19 | ||||
-rwxr-xr-x | maintainers/scripts/generate-kde-applications.sh | 5 | ||||
-rwxr-xr-x | maintainers/scripts/generate-kde-frameworks.sh | 5 | ||||
-rwxr-xr-x | maintainers/scripts/generate-kde-plasma.sh | 5 | ||||
-rwxr-xr-x | maintainers/scripts/generate-qt.sh | 6 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/applications/fetch.sh | 1 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/plasma/fetch.sh | 1 | ||||
-rw-r--r-- | pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix | 16 | ||||
-rw-r--r-- | pkgs/development/libraries/kde-frameworks/fetch.sh | 1 | ||||
-rwxr-xr-x | pkgs/development/libraries/qt-5/5.5/fetch.sh | 3 | ||||
-rwxr-xr-x | pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh | 54 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/5.6/fetch.sh | 3 | ||||
-rw-r--r-- | pkgs/development/libraries/qt-5/5.7/fetch.sh | 2 |
13 files changed, 25 insertions, 96 deletions
diff --git a/maintainers/scripts/fetch-kde-qt.sh b/maintainers/scripts/fetch-kde-qt.sh index c88d8729acea8..d7a9239027d8d 100755 --- a/maintainers/scripts/fetch-kde-qt.sh +++ b/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 -# DO NOT EDIT! This file is generated automatically by fetchsrcs.sh +cat >"$SRCS" <<EOF +# 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 diff --git a/maintainers/scripts/generate-kde-applications.sh b/maintainers/scripts/generate-kde-applications.sh deleted file mode 100755 index eee0c2749a09d..0000000000000 --- a/maintainers/scripts/generate-kde-applications.sh +++ /dev/null @@ -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 diff --git a/maintainers/scripts/generate-kde-frameworks.sh b/maintainers/scripts/generate-kde-frameworks.sh deleted file mode 100755 index b3b559b357160..0000000000000 --- a/maintainers/scripts/generate-kde-frameworks.sh +++ /dev/null @@ -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 diff --git a/maintainers/scripts/generate-kde-plasma.sh b/maintainers/scripts/generate-kde-plasma.sh deleted file mode 100755 index 24760e7ac0843..0000000000000 --- a/maintainers/scripts/generate-kde-plasma.sh +++ /dev/null @@ -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 diff --git a/maintainers/scripts/generate-qt.sh b/maintainers/scripts/generate-qt.sh deleted file mode 100755 index a4d79c1aac587..0000000000000 --- a/maintainers/scripts/generate-qt.sh +++ /dev/null @@ -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 diff --git a/pkgs/desktops/kde-5/applications/fetch.sh b/pkgs/desktops/kde-5/applications/fetch.sh new file mode 100644 index 0000000000000..b3c71c44fcf82 --- /dev/null +++ b/pkgs/desktops/kde-5/applications/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.kde.org/stable/applications/16.08.0/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/fetch.sh b/pkgs/desktops/kde-5/plasma/fetch.sh new file mode 100644 index 0000000000000..518c2e63163b5 --- /dev/null +++ b/pkgs/desktops/kde-5/plasma/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.kde.org/stable/plasma/5.7.4/ -A '*.tar.xz' ) diff --git a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix b/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix deleted file mode 100644 index 1967a0b8a4e0f..0000000000000 --- a/pkgs/desktops/kde-5/plasma/plasma-mediacenter.nix +++ /dev/null @@ -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 - ]; -} diff --git a/pkgs/development/libraries/kde-frameworks/fetch.sh b/pkgs/development/libraries/kde-frameworks/fetch.sh new file mode 100644 index 0000000000000..4a01d1d83147b --- /dev/null +++ b/pkgs/development/libraries/kde-frameworks/fetch.sh @@ -0,0 +1 @@ +WGET_ARGS=( http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' ) diff --git a/pkgs/development/libraries/qt-5/5.5/fetch.sh b/pkgs/development/libraries/qt-5/5.5/fetch.sh new file mode 100755 index 0000000000000..512d985f346ac --- /dev/null +++ b/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' ) diff --git a/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh b/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh deleted file mode 100755 index c958b5c9eed31..0000000000000 --- a/pkgs/development/libraries/qt-5/5.5/fetchsrcs.sh +++ /dev/null @@ -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 .. diff --git a/pkgs/development/libraries/qt-5/5.6/fetch.sh b/pkgs/development/libraries/qt-5/5.6/fetch.sh new file mode 100644 index 0000000000000..b5b76d3e6740f --- /dev/null +++ b/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' ) diff --git a/pkgs/development/libraries/qt-5/5.7/fetch.sh b/pkgs/development/libraries/qt-5/5.7/fetch.sh new file mode 100644 index 0000000000000..282fe742fd05b --- /dev/null +++ b/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' ) |