From 5630ac1d928ec9d1d773f4dccc5b24031fc8dae3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 13 Jul 2016 13:52:25 -0500 Subject: [PATCH] generate-kde-frameworks.sh: fix helper script path - Fix a bug in the script which prevented it from finding its helper script. - Automatically redirect the output of the script to make it even easier to use. --- maintainers/scripts/generate-kde-frameworks.sh | 4 +++- pkgs/desktops/kde-5/frameworks/default.nix | 12 ++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/maintainers/scripts/generate-kde-frameworks.sh b/maintainers/scripts/generate-kde-frameworks.sh index e690662b3f2..b3b559b3571 100755 --- a/maintainers/scripts/generate-kde-frameworks.sh +++ b/maintainers/scripts/generate-kde-frameworks.sh @@ -1,3 +1,5 @@ #!/bin/sh -./fetch-kde-qt.sh http://download.kde.org/stable/frameworks/5.24/ -A '*.tar.xz' +./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/pkgs/desktops/kde-5/frameworks/default.nix b/pkgs/desktops/kde-5/frameworks/default.nix index 1a8f08bde44..bff2b394038 100644 --- a/pkgs/desktops/kde-5/frameworks/default.nix +++ b/pkgs/desktops/kde-5/frameworks/default.nix @@ -2,14 +2,10 @@ # Updates -Before a major version update, make a copy of this directory. (We like to -keep the old version around for a short time after major updates.) - -1. Update the URL in `maintainers/scripts/generate-kde-frameworks.sh`. -2. From the top of the Nixpkgs tree, run - `./maintainers/scripts/generate-kde-frameworks.sh > pkgs/desktops/kde-5/frameworks/srcs.nix'. -3. Check that the new packages build correctly. -4. Commit the changes and open a pull request. +1. Update the URL in `maintainers/scripts/generate-kde-frameworks.sh` and + run that script from the top of the Nixpkgs tree. +2. Check that the new packages build correctly. +3. Commit the changes and open a pull request. */