diff options
author | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 01:07:45 +0000 |
---|---|---|
committer | Yury G. Kudryashov <urkud.urkud@gmail.com> | 2012-01-06 01:07:45 +0000 |
commit | 900c6e18cd2e71fcd3c5aad75f63c949f12d1c39 (patch) | |
tree | 3e242107fb40df46df8667c92ea209e91f95cbf4 /maintainers | |
parent | c96b647e300d657f081528d01d1debbeb63da74a (diff) | |
parent | dc9bf79b545d97216739e37aa2e02025d2f80019 (diff) | |
download | nixpkgs-900c6e18cd2e71fcd3c5aad75f63c949f12d1c39.tar nixpkgs-900c6e18cd2e71fcd3c5aad75f63c949f12d1c39.tar.gz nixpkgs-900c6e18cd2e71fcd3c5aad75f63c949f12d1c39.tar.bz2 nixpkgs-900c6e18cd2e71fcd3c5aad75f63c949f12d1c39.tar.lz nixpkgs-900c6e18cd2e71fcd3c5aad75f63c949f12d1c39.tar.xz nixpkgs-900c6e18cd2e71fcd3c5aad75f63c949f12d1c39.tar.zst nixpkgs-900c6e18cd2e71fcd3c5aad75f63c949f12d1c39.zip |
svn merge ^/nixpkgs/trunk
Conflicts: openssl, libplist svn path=/nixpkgs/branches/stdenv-updates/; revision=31337
Diffstat (limited to 'maintainers')
-rwxr-xr-x | maintainers/scripts/gnome-latest.sh | 18 |
1 files changed, 4 insertions, 14 deletions
diff --git a/maintainers/scripts/gnome-latest.sh b/maintainers/scripts/gnome-latest.sh index 00ec1a105da..9290b6deaff 100755 --- a/maintainers/scripts/gnome-latest.sh +++ b/maintainers/scripts/gnome-latest.sh @@ -84,20 +84,10 @@ sha256=`nix-hash --to-base32 --type sha256 $sha256` echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 cat <<EOF - src = fetchurl_gnome { - project = "${project}"; -EOF -echo -n " major = \"`echo ${version} | cut -d. -f1`\";" -echo -n " minor = \"`echo ${version} | cut -d. -f2`\";" -patchlevel=`echo ${version} | cut -d. -f3` -if [ -n "$patchlevel" ]; then - echo -n " patchlevel = \"${patchlevel}\";" -fi -if [ "$ext_pref" != "bz2" ]; then - echo -n " extension = \"${ext_pref}\";" -fi -echo -cat <<EOF + name = "${project}-${version}"; + + src = fetchurl { + url = mirror://gnome/sources/${project}/${baseVersion}/${project}-${version}.tar.${ext_pref}; sha256 = "${sha256}"; }; EOF |